[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r19940 - in /fsf/trunk/libc: ./ libio/ misc/ ports/ ports/sysdeps/arm/ ports/sysdeps/mips/sys/ ports/sysdeps/unix/sysv/linux...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r19940 - in /fsf/trunk/libc: ./ libio/ misc/ ports/ ports/sysdeps/arm/ ports/sysdeps/mips/sys/ ports/sysdeps/unix/sysv/linux...
- From: eglibc@xxxxxxxxxx
- Date: Thu, 02 Aug 2012 00:01:40 -0000
Author: eglibc
Date: Thu Aug 2 00:01:38 2012
New Revision: 19940
Log:
Import glibc-mainline for 2012-08-02
Added:
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
Removed:
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/getrlimit.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c
fsf/trunk/libc/sysdeps/wordsize-64/iofopen.c
fsf/trunk/libc/sysdeps/wordsize-64/iofopen64.c
fsf/trunk/libc/sysdeps/wordsize-64/mkostemp.c
fsf/trunk/libc/sysdeps/wordsize-64/mkostemp64.c
fsf/trunk/libc/sysdeps/wordsize-64/mkstemp.c
fsf/trunk/libc/sysdeps/wordsize-64/mkstemp64.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/WUR-REPORT
fsf/trunk/libc/libio/iofopen.c
fsf/trunk/libc/libio/iofopen64.c
fsf/trunk/libc/misc/mkostemp.c
fsf/trunk/libc/misc/mkostemp64.c
fsf/trunk/libc/misc/mkostemps.c
fsf/trunk/libc/misc/mkostemps64.c
fsf/trunk/libc/misc/mkstemp.c
fsf/trunk/libc/misc/mkstemp64.c
fsf/trunk/libc/misc/mkstemps.c
fsf/trunk/libc/misc/mkstemps64.c
fsf/trunk/libc/ports/ChangeLog.am33
fsf/trunk/libc/ports/ChangeLog.arm
fsf/trunk/libc/ports/ChangeLog.hppa
fsf/trunk/libc/ports/ChangeLog.m68k
fsf/trunk/libc/ports/ChangeLog.mips
fsf/trunk/libc/ports/ChangeLog.tile
fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h
fsf/trunk/libc/ports/sysdeps/mips/sys/asm.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
fsf/trunk/libc/posix/unistd.h
fsf/trunk/libc/sysdeps/generic/sys/param.h
fsf/trunk/libc/sysdeps/unix/Makefile
fsf/trunk/libc/sysdeps/unix/make-syscalls.sh
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/fcntl.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/lockf64.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/vfork.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fsuid.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Aug 2 00:01:38 2012
@@ -1,3 +1,103 @@
+2012-08-01 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * libio/iofopen.c: Include <fcntl.h>.
+ [_LIBC] [!defined O_LARGEFILE || O_LARGEFILE == 0]
+ (_IO_fopen64, fopen64): Define as aliases.
+ * libio/iofopen64.c: Include <fcntl.h>.
+ [!defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0)]:
+ Conditionalize body on this.
+ * sysdeps/wordsize-64/iofopen.c: File removed.
+ * sysdeps/wordsize-64/iofopen64.c: File removed.
+
+2012-08-01 Marek Polacek <polacek@xxxxxxxxxx>
+
+ * libc/Makeconfig: Use elf in place of binfmt-subdir.
+ Use dlfcn directly instead of a variable.
+ (binfmt-subdir): Do not define.
+ (dlfcn): Likewise.
+
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):
+ Remove all definitions.
+ * sysdeps/unix/sysv/linux/i386/fcntl.c: Do not include
+ <kernel-features.h>.
+ [!__ASSUME_FCNTL64] (__have_no_fcntl64): Remove.
+ (miss_F_GETOWN_EX): Remove all definitions.
+ [NO_CANCELLATION && !__ASSUME_FCNTL64] (__fcntl_nocancel): Remove
+ macro definition.
+ [!__ASSUME_FCNTL64]: Remove conditional code.
+ [__ASSUME_FCNTL64]: Make code unconditional.
+ * sysdeps/unix/sysv/linux/i386/lockf64.c: Do not include
+ <kernel-features.h>.
+ [__NR_fcntl64 && !__ASSUME_FCNTL64] (__have_no_fcntl64): Remove.
+ (lockf64) [!__ASSUME_FCNTL64]: Remove conditional code.
+ (lockf64) [__NR_fcntl64]: Make code unconditional.
+ (lockf64) [__ASSUME_FCNTL64]: Likewise.
+
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ (__ASSUME_VFORK_SYSCALL): Remove all definitions.
+ * sysdeps/unix/sysv/linux/i386/vfork.S (__vfork) [__NR_vfork]:
+ Make code unconditional.
+ (__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+ (__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S (__vfork)
+ [__NR_vfork]: Make code unconditional.
+ (__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+ (__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S (__vfork)
+ [__NR_vfork]: Make code unconditional.
+ (__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+ (__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+
+2012-08-01 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/generic/sys/param.h (NGROUPS): Define only if [NGROUPS_MAX].
+ (MAXSYMLINKS): Define only if [SYMLOOP_MAX].
+
+ * misc/mkstemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+ Define mkstemp64 as an alias.
+ * misc/mkstemps.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+ Define mkstemps64 as an alias.
+ * misc/mkostemp.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+ Define mkostemp64 as an alias.
+ * misc/mkostemps.c [!defined O_LARGEFILE || O_LARGEFILE == 0]:
+ Define mkostemps64 as an alias.
+ * misc/mkstemp64.c [defined O_LARGEFILE && O_LARGEFILE != 0]:
+ Conditionalize body on this.
+ * misc/mkostemp64.c: Likewise.
+ * misc/mkostemps64.c: Likewise.
+ * misc/mkstemps64.c: Likewise.
+ * sysdeps/wordsize-64/mkstemp64.c: File removed.
+ * sysdeps/wordsize-64/mkostemp64.c: File removed.
+ * sysdeps/wordsize-64/mkostemp.c: File removed.
+ * sysdeps/wordsize-64/mkstemp.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c: File removed.
+ * sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c: File removed.
+
+ [BZ #14138]
+ * sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
+ * sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.
+ * sysdeps/unix/sysv/linux/powerpc/getrlimit.c: File removed.
+ * sysdeps/unix/sysv/linux/sh/getrlimit.c: File removed.
+
+ * sysdeps/unix/make-syscalls.sh: Emit uses of the versioned_symbol and
+ compat_symbol macros from <shlib-compat.h> rather than the underlying
+ default_symbol_version and symbol_version macros, so that DEFAULT
+ lines in shlib-versions are respected.
+ * sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Likewise.
+
+2012-08-01 Florian Weimer <fweimer@xxxxxxxxxx>
+
+ * posix/unistd.h (setuid, setreuid, seteuid, setresuid):
+ Declare with warn_unused_result.
+ (setgid, setregid, setegid, setresgid): Likewise.
+ * sysdeps/unix/sysv/linux/sys/fsuid.h (setfsuid, setfsgid):
+ Likewise.
+ * WUR-REPORT: Remove set*id functions.
+
2012-07-31 Pino Toscano <toscano.pino@xxxxxxxxxx>
* sysdeps/mach/hurd/renameat.c: New file, mostly copied from rename.c.
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Thu Aug 2 00:01:38 2012
@@ -88,10 +88,6 @@
# What flags to give to tests which test stack alignment
stack-align-test-flags =
-
-# We have a special subdir for each binary format.
-# For now, only ELF is fully supported.
-binfmt-subdir = elf
# Complete path to sysdep dirs.
# `configure' writes a definition of `config-sysdirs' in `config.make'.
@@ -955,7 +951,6 @@
endif # build-shared
-dlfcn = dlfcn
ifeq ($(build-shared),yes)
libdl = $(common-objpfx)dlfcn/libdl.so$(libdl.so-version)
else
@@ -976,7 +971,7 @@
grp pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow gshadow po argp \
crypt nss localedata timezone rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ $(add-on-subdirs) dlfcn elf
ifndef avoid-generated
all-Depend-files := $(wildcard $(foreach dir,$(all-subdirs),\
Modified: fsf/trunk/libc/WUR-REPORT
==============================================================================
--- fsf/trunk/libc/WUR-REPORT (original)
+++ fsf/trunk/libc/WUR-REPORT Thu Aug 2 00:01:38 2012
@@ -3,17 +3,6 @@
lssek: Probably should be __wur but lseek(fd,SEEK_SET,0) will succeed if
the descriptor is fine.
lseek64: same
-
-setuid: will always succeed given correct privileges, so there might
- be places which don't check for it.
-setreuid: same
-seteuid: same
-setgid: same
-setregid: same
-setegid: same
-setresuid: same
-setresgid: same
-
<stdio.h>:
Modified: fsf/trunk/libc/libio/iofopen.c
==============================================================================
--- fsf/trunk/libc/libio/iofopen.c (original)
+++ fsf/trunk/libc/libio/iofopen.c Thu Aug 2 00:01:38 2012
@@ -25,6 +25,7 @@
in files containing the exception. */
#include "libioP.h"
+#include <fcntl.h>
#include <stdlib.h>
#include <stddef.h>
#ifdef _LIBC
@@ -106,4 +107,9 @@
strong_alias (_IO_new_fopen, __new_fopen)
versioned_symbol (libc, _IO_new_fopen, _IO_fopen, GLIBC_2_1);
versioned_symbol (libc, __new_fopen, fopen, GLIBC_2_1);
+
+# if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (_IO_new_fopen, _IO_fopen64)
+weak_alias (_IO_new_fopen, fopen64)
+# endif
#endif
Modified: fsf/trunk/libc/libio/iofopen64.c
==============================================================================
--- fsf/trunk/libc/libio/iofopen64.c (original)
+++ fsf/trunk/libc/libio/iofopen64.c Thu Aug 2 00:01:38 2012
@@ -25,7 +25,11 @@
in files containing the exception. */
#include "libioP.h"
+#include <fcntl.h>
#include <stdlib.h>
+
+/* iofopen.c defines _IO_fopen64/fopen64 as aliases if O_LARGEFILE==0. */
+#if !defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0)
_IO_FILE *
_IO_fopen64 (filename, mode)
@@ -43,3 +47,5 @@
#ifdef weak_alias
weak_alias (_IO_fopen64, fopen64)
#endif
+
+#endif
Modified: fsf/trunk/libc/misc/mkostemp.c
==============================================================================
--- fsf/trunk/libc/misc/mkostemp.c (original)
+++ fsf/trunk/libc/misc/mkostemp.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1998-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,7 @@
{
return __gen_tempname (template, 0, flags, __GT_FILE);
}
+
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (mkostemp, mkostemp64)
+#endif
Modified: fsf/trunk/libc/misc/mkostemp64.c
==============================================================================
--- fsf/trunk/libc/misc/mkostemp64.c (original)
+++ fsf/trunk/libc/misc/mkostemp64.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2007, 2009 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
@@ -19,6 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
+/* If O_LARGEFILE is zero, mkostemp.c defines mkostemp64 as an alias. */
+#if defined O_LARGEFILE && O_LARGEFILE != 0
+
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the filename unique.
@@ -30,3 +33,5 @@
{
return __gen_tempname (template, 0, flags | O_LARGEFILE, __GT_FILE);
}
+
+#endif
Modified: fsf/trunk/libc/misc/mkostemps.c
==============================================================================
--- fsf/trunk/libc/misc/mkostemps.c (original)
+++ fsf/trunk/libc/misc/mkostemps.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-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
@@ -41,3 +41,7 @@
return __gen_tempname (template, suffixlen, flags, __GT_FILE);
}
+
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (mkostemps, mkostemps64)
+#endif
Modified: fsf/trunk/libc/misc/mkostemps64.c
==============================================================================
--- fsf/trunk/libc/misc/mkostemps64.c (original)
+++ fsf/trunk/libc/misc/mkostemps64.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2007, 2009 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
@@ -20,6 +20,9 @@
#include <stdio.h>
#include <stdlib.h>
+/* If O_LARGEFILE is zero, mkostemps.c defines mkostemps64 as an alias. */
+#if defined O_LARGEFILE && O_LARGEFILE != 0
+
/* Generate a unique temporary file name from TEMPLATE. The last six
characters before a suffix of length SUFFIXLEN of TEMPLATE must be
"XXXXXX"; they are replaced with a string that makes the filename
@@ -38,3 +41,5 @@
return __gen_tempname (template, suffixlen, flags | O_LARGEFILE, __GT_FILE);
}
+
+#endif
Modified: fsf/trunk/libc/misc/mkstemp.c
==============================================================================
--- fsf/trunk/libc/misc/mkstemp.c (original)
+++ fsf/trunk/libc/misc/mkstemp.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2001, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1998-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
@@ -32,3 +32,7 @@
{
return __gen_tempname (template, 0, 0, __GT_FILE);
}
+
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (mkstemp, mkstemp64)
+#endif
Modified: fsf/trunk/libc/misc/mkstemp64.c
==============================================================================
--- fsf/trunk/libc/misc/mkstemp64.c (original)
+++ fsf/trunk/libc/misc/mkstemp64.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2007, 2009 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
@@ -19,6 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
+/* If O_LARGEFILE is zero, mkstemp.c defines mkstemp64 as an alias. */
+#if defined O_LARGEFILE && O_LARGEFILE != 0
+
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the filename unique.
@@ -29,3 +32,5 @@
{
return __gen_tempname (template, 0, O_LARGEFILE, __GT_FILE);
}
+
+#endif
Modified: fsf/trunk/libc/misc/mkstemps.c
==============================================================================
--- fsf/trunk/libc/misc/mkstemps.c (original)
+++ fsf/trunk/libc/misc/mkstemps.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009-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 @@
return __gen_tempname (template, suffixlen, 0, __GT_FILE);
}
+
+#if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (mkstemps, mkstemps64)
+#endif
Modified: fsf/trunk/libc/misc/mkstemps64.c
==============================================================================
--- fsf/trunk/libc/misc/mkstemps64.c (original)
+++ fsf/trunk/libc/misc/mkstemps64.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2007, 2009 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
@@ -20,6 +20,9 @@
#include <stdio.h>
#include <stdlib.h>
+/* If O_LARGEFILE is zero, mkstemps.c defines mkstemps64 as an alias. */
+#if defined O_LARGEFILE && O_LARGEFILE != 0
+
/* Generate a unique temporary file name from TEMPLATE. The last six
characters before a suffix of length SUFFIXLEN of TEMPLATE must be
"XXXXXX"; they are replaced with a string that makes the filename
@@ -37,3 +40,5 @@
return __gen_tempname (template, suffixlen, O_LARGEFILE, __GT_FILE);
}
+
+#endif
Modified: fsf/trunk/libc/ports/ChangeLog.am33
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.am33 (original)
+++ fsf/trunk/libc/ports/ChangeLog.am33 Thu Aug 2 00:01:38 2012
@@ -1,3 +1,8 @@
+2012-08-01 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ [BZ #14138]
+ * sysdeps/unix/sysv/linux/am33/getrlimit.c: File removed.
+
2012-03-09 Paul Eggert <eggert@xxxxxxxxxxx>
[BZ #13673]
Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Thu Aug 2 00:01:38 2012
@@ -1,3 +1,20 @@
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h
+ (__ASSUME_FCNTL64): Remove.
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h
+ (__ASSUME_VFORK_SYSCALL): Remove.
+
+2012-08-01 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/arm/dl-machine.h (CLEAR_CACHE): Don't define it.
+ Instead, #error if it's not defined.
+ * sysdeps/unix/sysv/linux/arm/dl-machine.h: New file.
+
+ [BZ #14138]
+ * sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed.
+
2012-07-30 Roland McGrath <roland@xxxxxxxxxxxxx>
* sysdeps/arm/preconfigure: Don't refuse configurations with
Modified: fsf/trunk/libc/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.hppa (original)
+++ fsf/trunk/libc/ports/ChangeLog.hppa Thu Aug 2 00:01:38 2012
@@ -1,3 +1,8 @@
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ (__ASSUME_FCNTL64): Remove.
+
2012-07-26 Andreas Jaeger <aj@xxxxxxx>
* sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLLWAKEUP): Add new
Modified: fsf/trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.m68k (original)
+++ fsf/trunk/libc/ports/ChangeLog.m68k Thu Aug 2 00:01:38 2012
@@ -1,3 +1,20 @@
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/m68k/kernel-features.h
+ (__ASSUME_FCNTL64): Remove.
+
+ * sysdeps/unix/sysv/linux/m68k/kernel-features.h
+ (__ASSUME_VFORK_SYSCALL): Remove.
+ * sysdeps/unix/sysv/linux/m68k/vfork.S (__vfork) [__NR_vfork]:
+ Make code unconditional.
+ (__vfork) [__ASSUME_VFORK_SYSCALL]: Likewise.
+ (__vfork) [!__ASSUME_VFORK_SYSCALL]: Remove conditional code.
+
+2012-08-01 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ [BZ #14138]
+ * sysdeps/unix/sysv/linux/m68k/getrlimit.c: File removed.
+
2012-08-01 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
* sysdeps/m68k/m680x0/fpu/libm-test-ulps: Update.
Modified: fsf/trunk/libc/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.mips (original)
+++ fsf/trunk/libc/ports/ChangeLog.mips Thu Aug 2 00:01:38 2012
@@ -1,3 +1,16 @@
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/kernel-features.h
+ (__ASSUME_FCNTL64): Remove.
+
+2012-08-01 Steve Ellcey <sellcey@xxxxxxxx>
+
+ * sysdeps/mips/sys/asm.h [_MIPS_ISA != _MIPS_ISA_MIPS4 &&
+ _MIPS_ISA != _MIPS_ISA_MIPS5 && _MIPS_ISA != _MIPS_ISA_MIPS32 &&
+ _MIPS_ISA != _MIPS_ISA_MIPS64] (PREF): Define as function-like
+ macro.
+ (PREFX): Likewise.
+
2012-07-31 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/fcntl.c: Remove.
Modified: fsf/trunk/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.tile (original)
+++ fsf/trunk/libc/ports/ChangeLog.tile Thu Aug 2 00:01:38 2012
@@ -1,3 +1,8 @@
+2012-08-01 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/tile/kernel-features.h
+ (__ASSUME_FCNTL64): Remove.
+
2012-07-26 Andreas Jaeger <aj@xxxxxxx>
* sysdeps/unix/sysv/linux/tile/sys/ptrace.h (__ptrace_eventcodes):
Modified: fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/dl-machine.h Thu Aug 2 00:01:38 2012
@@ -1,6 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. ARM version.
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,
- 2006, 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
@@ -27,8 +26,9 @@
#include <dl-tlsdesc.h>
#include <dl-irel.h>
-#define CLEAR_CACHE(BEG,END) \
- INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
+#ifndef CLEAR_CACHE
+# error CLEAR_CACHE definition required to handle TEXTREL
+#endif
/* Return nonzero iff ELF header is compatible with the running host. */
static inline int __attribute__ ((unused))
Modified: fsf/trunk/libc/ports/sysdeps/mips/sys/asm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/mips/sys/asm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/mips/sys/asm.h Thu Aug 2 00:01:38 2012
@@ -233,8 +233,8 @@
# define PREFX(hint,addr) \
prefx hint,addr
#else
-# define PREF
-# define PREFX
+# define PREF(hint,addr)
+# define PREFX(hint,addr)
#endif
/*
Removed: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
Added: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h (added)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/dl-machine.h Thu Aug 2 00:01:38 2012
@@ -1,0 +1,28 @@
+/* Machine-dependent ELF dynamic relocation inline functions. ARM/Linux version
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef dl_machine_h
+
+/* This definition is Linux-specific. */
+#define CLEAR_CACHE(BEG,END) \
+ INTERNAL_SYSCALL_ARM (cacheflush, , 3, (BEG), (END), 0)
+
+/* The rest is just machine-specific. */
+#include <sysdeps/arm/dl-machine.h>
+
+#endif
Removed: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -27,12 +27,6 @@
#define __ASSUME_MMAP2_SYSCALL 1
#define __ASSUME_STAT64_SYSCALL 1
-/* Arm got fcntl64 in 2.4.4. */
-#define __ASSUME_FCNTL64 1
-
-/* The vfork syscall on arm was definitely available in 2.4. */
-#define __ASSUME_VFORK_SYSCALL 1
-
/* The signal frame layout changed in 2.6.18. */
#if __LINUX_KERNEL_VERSION >= 132626
# define __ASSUME_SIGFRAME_V2 1
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -27,7 +27,6 @@
#define __ASSUME_STAT64_SYSCALL 1
#define __ASSUME_IPC64 1
#define __ASSUME_ST_INO_64_BIT 1
-#define __ASSUME_FCNTL64 1
#define __ASSUME_GETDENTS64_SYSCALL 1
/* PA-RISC 2.6.9 kernels had the first LWS CAS support */
Removed: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -20,8 +20,6 @@
/* These features were surely available with 2.4.12. */
#define __ASSUME_MMAP2_SYSCALL 1
#define __ASSUME_STAT64_SYSCALL 1
-#define __ASSUME_FCNTL64 1
-#define __ASSUME_VFORK_SYSCALL 1
/* Many syscalls were added in 2.6.10 for m68k. */
#if __LINUX_KERNEL_VERSION >= 132618
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/vfork.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/vfork.S (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/vfork.S Thu Aug 2 00:01:38 2012
@@ -36,8 +36,6 @@
ENTRY (__vfork)
-#ifdef __NR_vfork
-
/* SAVE_PID clobbers call-clobbered registers and
saves data in D1 and A1. */
@@ -66,27 +64,8 @@
cfi_adjust_cfa_offset (4)
cfi_rel_offset (%pc, 0)
-# ifdef __ASSUME_VFORK_SYSCALL
-# ifndef PIC
+#ifndef PIC
jbra SYSCALL_ERROR_LABEL
-# endif
-# else
- /* Check if vfork syscall is known at all. */
- movel #-ENOSYS,%d1
- cmpl %d0,%d1
- jne SYSCALL_ERROR_LABEL
-
-# endif
-#endif
-
-#ifndef __ASSUME_VFORK_SYSCALL
- /* If we don't have vfork, fork is close enough. */
-
- movel #SYS_ify (fork), %d0
- trap #0
- tstl %d0
- jmi SYSCALL_ERROR_LABEL
- rts
#endif
PSEUDO_END (__vfork)
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -22,10 +22,6 @@
/* MIPS platforms had IPC64 all along. */
#define __ASSUME_IPC64 1
-#if _MIPS_SIM == _ABIN32
-# define __ASSUME_FCNTL64 1
-#endif
-
/* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.27. */
#if __LINUX_KERNEL_VERSION >= 0x02061c
# define __ASSUME_EVENTFD2 1
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@xxxxxxxxxx>, 2011.
@@ -20,7 +20,6 @@
/* TILE glibc support starts with 2.6.36, guaranteeing many kernel features. */
#define __ASSUME_MMAP2_SYSCALL 1
#define __ASSUME_STAT64_SYSCALL 1
-#define __ASSUME_FCNTL64 1
#define __ASSUME_CLONE_THREAD_FLAGS 1
#define __ASSUME_TGKILL 1
#define __ASSUME_UTIMES 1
Modified: fsf/trunk/libc/posix/unistd.h
==============================================================================
--- fsf/trunk/libc/posix/unistd.h (original)
+++ fsf/trunk/libc/posix/unistd.h Thu Aug 2 00:01:38 2012
@@ -719,34 +719,34 @@
If the calling process is the super-user, set the real
and effective user IDs, and the saved set-user-ID to UID;
if not, the effective user ID is set to UID. */
-extern int setuid (__uid_t __uid) __THROW;
+extern int setuid (__uid_t __uid) __THROW __wur;
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Set the real user ID of the calling process to RUID,
and the effective user ID of the calling process to EUID. */
-extern int setreuid (__uid_t __ruid, __uid_t __euid) __THROW;
+extern int setreuid (__uid_t __ruid, __uid_t __euid) __THROW __wur;
#endif
#if defined __USE_BSD || defined __USE_XOPEN2K
/* Set the effective user ID of the calling process to UID. */
-extern int seteuid (__uid_t __uid) __THROW;
+extern int seteuid (__uid_t __uid) __THROW __wur;
#endif /* Use BSD. */
/* Set the group ID of the calling process to GID.
If the calling process is the super-user, set the real
and effective group IDs, and the saved set-group-ID to GID;
if not, the effective group ID is set to GID. */
-extern int setgid (__gid_t __gid) __THROW;
+extern int setgid (__gid_t __gid) __THROW __wur;
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Set the real group ID of the calling process to RGID,
and the effective group ID of the calling process to EGID. */
-extern int setregid (__gid_t __rgid, __gid_t __egid) __THROW;
+extern int setregid (__gid_t __rgid, __gid_t __egid) __THROW __wur;
#endif
#if defined __USE_BSD || defined __USE_XOPEN2K
/* Set the effective group ID of the calling process to GID. */
-extern int setegid (__gid_t __gid) __THROW;
+extern int setegid (__gid_t __gid) __THROW __wur;
#endif /* Use BSD. */
#ifdef __USE_GNU
@@ -763,12 +763,12 @@
/* Set the real user ID, effective user ID, and saved-set user ID,
of the calling process to RUID, EUID, and SUID, respectively. */
extern int setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid)
- __THROW;
+ __THROW __wur;
/* Set the real group ID, effective group ID, and saved-set group ID,
of the calling process to RGID, EGID, and SGID, respectively. */
extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid)
- __THROW;
+ __THROW __wur;
#endif
Modified: fsf/trunk/libc/sysdeps/generic/sys/param.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/sys/param.h (original)
+++ fsf/trunk/libc/sysdeps/generic/sys/param.h Thu Aug 2 00:01:38 2012
@@ -35,8 +35,12 @@
for the values which are not statically limited, such as NOFILE. */
#define NBBY CHAR_BIT
-#define NGROUPS NGROUPS_MAX
-#define MAXSYMLINKS SYMLOOP_MAX
+#ifdef NGROUPS_MAX
+# define NGROUPS NGROUPS_MAX
+#endif
+#ifdef SYMLOOP_MAX
+# define MAXSYMLINKS SYMLOOP_MAX
+#endif
#define CANBSIZ MAX_CANON /* XXX ? */
/* ARG_MAX is unlimited, but we define NCARGS for BSD programs that want to
Modified: fsf/trunk/libc/sysdeps/unix/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/Makefile Thu Aug 2 00:01:38 2012
@@ -37,23 +37,29 @@
$(..)sysdeps/unix/Makefile
$(make-target-directory)
(for call in $(unix-stub-syscalls); do \
+ call=$${call%%@*}; \
echo "#define $$call RENAMED_$$call"; \
done; \
echo '#include <errno.h>'; \
+ echo '#include <shlib-compat.h>'; \
for call in $(unix-stub-syscalls); do \
+ call=$${call%%@*}; \
echo "#undef $$call"; \
done; \
echo 'long int _no_syscall (void)'; \
echo '{ __set_errno (ENOSYS); return -1L; }'; \
for call in $(unix-stub-syscalls); do \
case $$call in \
- *@@*) ver=$${call##*@}; call=$${call%%*@}; \
- echo "strong_alias (_no_syscall, $${call}_$${ver})"; \
- echo "default_symbol_version \
- ($${call}_$${ver}, $$call, $$ver);" ;; \
- *@*) ver=$${call##*@}; call=$${call%%*@}; \
- echo "strong_alias (_no_syscall, $${call}_$${ver})"; \
- echo "symbol_version ($${call}_$${ver}, $$call, $$ver);" ;; \
+ *@@*) \
+ ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+ echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
+ echo "versioned_symbol (libc, __$${call}_$${ver}, $$call, $$ver);"\
+ ;; \
+ *@*) \
+ ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+ echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
+ echo "compat_symbol (libc, __$${call}_$${ver}, $$call, $$ver);" \
+ ;; \
*) echo "weak_alias (_no_syscall, $$call)"; \
echo "stub_warning ($$call)"; \
echo "weak_alias (_no_syscall, __GI_$$call)" ;; \
Modified: fsf/trunk/libc/sysdeps/unix/make-syscalls.sh
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/make-syscalls.sh (original)
+++ fsf/trunk/libc/sysdeps/unix/make-syscalls.sh Thu Aug 2 00:01:38 2012
@@ -64,18 +64,30 @@
# Any calls left?
test -n "$calls" || exit 0
-# This uses variables $weak and $strong.
+# This uses variables $weak, $strong, and $any_versioned.
emit_weak_aliases()
{
# A shortcoming in the current gas is that it will only allow one
# version-alias per symbol. So we create new strong aliases as needed.
vcount=""
+ # We use the <shlib-compat.h> macros to generate the versioned aliases
+ # so that the version sets can be mapped to the configuration's
+ # minimum version set as per shlib-versions DEFAULT lines. But note
+ # we don't generate any "#if SHLIB_COMPAT (...)" conditionals. To do
+ # that we'd need to change the syscalls.list format so that it can
+ # list the "obsoleted" version set too. If it ever arises that we
+ # have a syscall entry point that is obsoleted by a newer version set,
+ # we'll have to revamp all this.
+ if [ $any_versioned = t ]; then
+ echo " echo '#include <shlib-compat.h>'; \\"
+ fi
+
for name in $weak; do
case $name in
*@@*)
base=`echo $name | sed 's/@@.*//'`
- ver=`echo $name | sed 's/.*@@//'`
+ ver=`echo $name | sed 's/.*@@//;s/\./_/g'`
echo " echo '#ifndef NOT_IN_libc'; \\"
if test -z "$vcount" ; then
source=$strong
@@ -85,14 +97,14 @@
vcount=`expr $vcount + 1`
echo " echo 'strong_alias ($strong, $source)'; \\"
fi
- echo " echo 'default_symbol_version($source, $base, $ver)'; \\"
+ echo " echo 'versioned_symbol (libc, $source, $base, $ver)'; \\"
echo " echo '#else'; \\"
echo " echo 'strong_alias ($strong, $base)'; \\"
echo " echo '#endif'; \\"
;;
*@*)
base=`echo $name | sed 's/@.*//'`
- ver=`echo $name | sed 's/.*@//'`
+ ver=`echo $name | sed 's/.*@//;s/\./_/g'`
echo " echo '#ifndef NOT_IN_libc'; \\"
if test -z "$vcount" ; then
source=$strong
@@ -102,7 +114,7 @@
vcount=`expr $vcount + 1`
echo " echo 'strong_alias ($strong, $source)'; \\"
fi
- echo " echo 'symbol_version ($source, $base, $ver)'; \\"
+ echo " echo 'compat_symbol (libc, $source, $base, $ver)'; \\"
echo " echo '#endif'; \\"
;;
!*)
@@ -175,10 +187,11 @@
# If there are versioned aliases the entry is only generated for the
# shared library, unless it is a default version.
+ any_versioned=f
shared_only=f
case $weak in
- *@@*) ;;
- *@*) shared_only=t;;
+ *@@*) any_versioned=t ;;
+ *@*) any_versioned=t shared_only=t ;;
esac
case x$srcfile"$callnum" in
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/fcntl.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/fcntl.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/fcntl.c Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,2002-2004,2006,2009,2010 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
@@ -22,25 +22,8 @@
#include <stdarg.h>
#include <sys/syscall.h>
-#include <kernel-features.h>
-#ifndef __ASSUME_FCNTL64
-/* This variable is shared with all files that check for fcntl64. */
-int __have_no_fcntl64;
-#endif
-
-#ifdef __ASSUME_F_GETOWN_EX
-# define miss_F_GETOWN_EX 0
-#elif !defined __ASSUME_FCNTL64
-static int miss_F_GETOWN_EX;
-#endif
-
-
-#if defined NO_CANCELLATION && !defined __ASSUME_FCNTL64
-# define __fcntl_nocancel __libc_fcntl
-#endif
-
-#if !defined NO_CANCELLATION || !defined __ASSUME_FCNTL64
+#ifndef NO_CANCELLATION
int
__fcntl_nocancel (int fd, int cmd, ...)
{
@@ -51,112 +34,11 @@
arg = va_arg (ap, void *);
va_end (ap);
-#ifndef __ASSUME_FCNTL64
-# ifdef __NR_fcntl64
- if (! __have_no_fcntl64)
- {
- int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
- if (result >= 0 || errno != ENOSYS)
- return result;
-
- __have_no_fcntl64 = 1;
- }
-# endif
- switch (cmd)
- {
- case F_GETLK64:
- /* Convert arg from flock64 to flock and back. */
- {
- struct flock fl;
- struct flock64 *fl64 = arg;
- int res;
-
- fl.l_start = (off_t)fl64->l_start;
- /* Check if we can represent the values with the smaller type. */
- if ((off64_t) fl.l_start != fl64->l_start)
- {
- eoverflow:
- __set_errno (EOVERFLOW);
- return -1;
- }
- fl.l_len = (off_t) fl64->l_len;
- /* Check if we can represent the values with the smaller type. */
- if ((off64_t) fl.l_len != fl64->l_len)
- goto eoverflow;
-
- fl.l_type = fl64->l_type;
- fl.l_whence = fl64->l_whence;
- fl.l_pid = fl64->l_pid;
-
- res = INLINE_SYSCALL (fcntl, 3, fd, F_GETLK, &fl);
- if (res != 0)
- return res;
- /* Everything ok, convert back. */
- fl64->l_type = fl.l_type;
- fl64->l_whence = fl.l_whence;
- fl64->l_start = fl.l_start;
- fl64->l_len = fl.l_len;
- fl64->l_pid = fl.l_pid;
-
- return 0;
- }
- case F_SETLK64:
- case F_SETLKW64:
- /* Try to convert arg from flock64 to flock. */
- {
- struct flock fl;
- struct flock64 *fl64 = arg;
-
- fl.l_start = (off_t) fl64->l_start;
- /* Check if we can represent the values with the smaller type. */
- if ((off64_t) fl.l_start != fl64->l_start)
- goto eoverflow;
-
- fl.l_len = (off_t)fl64->l_len;
- /* Check if we can represent the values with the smaller type. */
- if ((off64_t) fl.l_len != fl64->l_len)
- {
- __set_errno (EOVERFLOW);
- return -1;
- }
- fl.l_type = fl64->l_type;
- fl.l_whence = fl64->l_whence;
- fl.l_pid = fl64->l_pid;
- assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64);
- return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl);
- }
- case F_GETOWN:
- if (! miss_F_GETOWN_EX)
- {
- INTERNAL_SYSCALL_DECL (err);
- struct f_owner_ex fex;
- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex);
- if (!INTERNAL_SYSCALL_ERROR_P (res, err))
- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
-
-# ifndef __ASSUME_F_GETOWN_EX
- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
- miss_F_GETOWN_EX = 1;
- else
-# endif
- {
- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
- return -1;
- }
- }
- /* FALLTHROUGH */
- default:
- return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
- }
- return -1;
-#else
return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
-#endif /* !__ASSUME_FCNTL64 */
}
-#endif /* NO_CANCELLATION || !__ASSUME_FCNTL64 */
+#endif /* NO_CANCELLATION */
-#ifndef __fcntl_nocancel
int
__libc_fcntl (int fd, int cmd, ...)
{
@@ -167,27 +49,17 @@
arg = va_arg (ap, void *);
va_end (ap);
-# ifdef __ASSUME_FCNTL64
if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
return INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
int oldtype = LIBC_CANCEL_ASYNC ();
int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, arg);
-# else
- if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
- return __fcntl_nocancel (fd, cmd, arg);
-
- int oldtype = LIBC_CANCEL_ASYNC ();
-
- int result = __fcntl_nocancel (fd, cmd, arg);
-# endif
LIBC_CANCEL_RESET (oldtype);
return result;
}
-#endif
libc_hidden_def (__libc_fcntl)
weak_alias (__libc_fcntl, __fcntl)
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/getrlimit.c (removed)
@@ -1,38 +1,0 @@
-/* Copyright (C) 1999-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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <sys/resource.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <shlib-compat.h>
-#include <bp-checks.h>
-
-extern int __new_getrlimit (enum __rlimit_resource resource,
- struct rlimit *__unbounded rlimits);
-
-/* Consider moving to syscalls.list. */
-
-int
-__new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
-{
- return INLINE_SYSCALL (ugetrlimit, 2, resource, CHECK_1 (rlimits));
-}
-
-weak_alias (__new_getrlimit, __getrlimit);
-versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/lockf64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/lockf64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/lockf64.c Thu Aug 2 00:01:38 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1994,1996,1997,1998,1999,2000,2003,2006
- 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
@@ -23,66 +22,24 @@
#include <string.h>
#include <sysdep.h>
-#include <kernel-features.h>
-
/* lockf is a simplified interface to fcntl's locking facilities. */
-
-#ifdef __NR_fcntl64
-# if __ASSUME_FCNTL64 == 0
-/* This variable is shared with all files that check for fcntl64. The
- declaration is in fcntl.c. */
-extern int __have_no_fcntl64;
-# endif
-#endif
int
lockf64 (int fd, int cmd, off64_t len64)
{
-#if __ASSUME_FCNTL64 == 0
- struct flock fl;
- off_t len = (off_t) len64;
-#endif
-#ifdef __NR_fcntl64
struct flock64 fl64;
int cmd64;
-#endif
-#if __ASSUME_FCNTL64 == 0
- memset ((char *) &fl, '\0', sizeof (fl));
+ memset ((char *) &fl64, '\0', sizeof (fl64));
+ fl64.l_whence = SEEK_CUR;
+ fl64.l_start = 0;
+ fl64.l_len = len64;
- /* lockf is always relative to the current file position. */
- fl.l_whence = SEEK_CUR;
- fl.l_start = 0;
- fl.l_len = len;
-#endif
-#ifdef __NR_fcntl64
-# if __ASSUME_FCNTL64 == 0
- if (!__have_no_fcntl64)
- {
-# endif
- memset ((char *) &fl64, '\0', sizeof (fl64));
- fl64.l_whence = SEEK_CUR;
- fl64.l_start = 0;
- fl64.l_len = len64;
-# if __ASSUME_FCNTL64 == 0
- }
-# endif
-#endif
-
-#if __ASSUME_FCNTL64 == 0 && !defined __NR_fcntl64
- if (len64 != (off64_t) len)
- {
- /* We can't represent the length. */
- __set_errno (EOVERFLOW);
- return -1;
- }
-#endif
switch (cmd)
{
case F_TEST:
/* Test the lock: return 0 if FD is unlocked or locked by this process;
return -1, set errno to EACCES, if another process holds the lock. */
-#if __ASSUME_FCNTL64 > 0
fl64.l_type = F_RDLCK;
if (INLINE_SYSCALL (fcntl64, 3, fd, F_GETLK64, &fl64) < 0)
return -1;
@@ -90,104 +47,22 @@
return 0;
__set_errno (EACCES);
return -1;
-#else
-# ifdef __NR_fcntl64
- if (!__have_no_fcntl64)
- {
- int res;
-
- fl64.l_type = F_RDLCK;
- res = INLINE_SYSCALL (fcntl64, 3, fd, F_GETLK64, &fl64);
- /* If errno == ENOSYS try the 32bit interface if len64 can
- be represented with 32 bits. */
-
- if (res == 0)
- {
- if (fl64.l_type == F_UNLCK || fl64.l_pid == __getpid ())
- return 0;
- __set_errno (EACCES);
- return -1;
- }
- else if (errno == ENOSYS)
- __have_no_fcntl64 = 1;
- else
- /* res < 0 && errno != ENOSYS. */
- return -1;
- if (len64 != (off64_t) len)
- {
- /* We can't represent the length. */
- __set_errno (EOVERFLOW);
- return -1;
- }
- }
-# endif
- fl.l_type = F_RDLCK;
- if (__fcntl (fd, F_GETLK, &fl) < 0)
- return -1;
- if (fl.l_type == F_UNLCK || fl.l_pid == __getpid ())
- return 0;
- __set_errno (EACCES);
- return -1;
-#endif
case F_ULOCK:
-#if __ASSUME_FCNTL64 == 0
- fl.l_type = F_UNLCK;
- cmd = F_SETLK;
-#endif
-#ifdef __NR_fcntl64
fl64.l_type = F_UNLCK;
cmd64 = F_SETLK64;
-#endif
break;
case F_LOCK:
-#if __ASSUME_FCNTL64 == 0
- fl.l_type = F_WRLCK;
- cmd = F_SETLKW;
-#endif
-#ifdef __NR_fcntl64
fl64.l_type = F_WRLCK;
cmd64 = F_SETLKW64;
-#endif
break;
case F_TLOCK:
-#if __ASSUME_FCNTL64 == 0
- fl.l_type = F_WRLCK;
- cmd = F_SETLK;
-#endif
-#ifdef __NR_fcntl64
fl64.l_type = F_WRLCK;
cmd64 = F_SETLK64;
-#endif
break;
default:
__set_errno (EINVAL);
return -1;
}
-#if __ASSUME_FCNTL64 > 0
return INLINE_SYSCALL (fcntl64, 3, fd, cmd64, &fl64);
-#else
-# ifdef __NR_fcntl64
-
- if (!__have_no_fcntl64)
- {
- int res = INLINE_SYSCALL (fcntl64, 3, fd, cmd64, &fl64);
-
- /* If errno == ENOSYS try the 32bit interface if len64 can
- be represented with 32 bits. */
- if (res == 0 || errno != ENOSYS)
- return res;
-
- __have_no_fcntl64 = 1;
-
- if (len64 != (off64_t) len)
- {
- /* We can't represent the length. */
- __set_errno (EOVERFLOW);
- return -1;
- }
- }
-# endif
- return __fcntl (fd, cmd, &fl);
-#endif
}
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/vfork.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/vfork.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/i386/vfork.S Thu Aug 2 00:01:38 2012
@@ -28,8 +28,6 @@
ENTRY (__vfork)
-#ifdef __NR_vfork
-
/* Pop the return PC value into ECX. */
popl %ecx
cfi_adjust_cfa_offset (-4)
@@ -55,31 +53,10 @@
cmpl $-4095, %eax
/* Branch forward if it failed. */
-# ifdef __ASSUME_VFORK_SYSCALL
jae SYSCALL_ERROR_LABEL
-# else
- jae .Lerror
-# endif
ret
-# ifndef __ASSUME_VFORK_SYSCALL
-.Lerror:
- /* Check if vfork syscall is known at all. */
- cmpl $-ENOSYS, %eax
- jne SYSCALL_ERROR_LABEL
-# endif
-#endif
-
-#ifndef __ASSUME_VFORK_SYSCALL
- /* If we don't have vfork, fork is close enough. */
-
- movl $SYS_ify (fork), %eax
- int $0x80
- cmpl $-4095, %eax
- jae SYSCALL_ERROR_LABEL
- ret
-#endif
PSEUDO_END (__vfork)
libc_hidden_def (__vfork)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h Thu Aug 2 00:01:38 2012
@@ -82,29 +82,9 @@
# define __ASSUME_ST_INO_64_BIT 1
#endif
-/* To support locking of large files a new fcntl() syscall was introduced
- in 2.4.0-test7. */
-#if defined __i386__ || defined __sparc__
-# define __ASSUME_FCNTL64 1
-#endif
-
-/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
- don't know when it got introduced). But PowerPC64 does not support
- separate FCNTL64 call, FCNTL is already 64-bit */
-#if (defined __powerpc__ || defined __sh__) \
- && !defined __powerpc64__
-# define __ASSUME_FCNTL64 1
-#endif
-
/* The getdents64 syscall was introduced in 2.4.0-test7 (but later for
MIPS n32). */
#define __ASSUME_GETDENTS64_SYSCALL 1
-
-/* Starting with 2.4.5 kernels the vfork syscall made it into the
- official kernel for PPC. */
-#ifdef __powerpc__
-# define __ASSUME_VFORK_SYSCALL 1
-#endif
/* Starting with 2.4.5 kernels the mmap2 syscall made it into the official
kernel. But PowerPC64 does not support a separate MMAP2 call. */
@@ -116,11 +96,6 @@
semantics was changed in 2.5.30, and again after 2.5.31. */
#if __LINUX_KERNEL_VERSION >= 132384 && defined __i386__
# define __ASSUME_SET_THREAD_AREA_SYSCALL 1
-#endif
-
-/* The vfork syscall on x86 and arm was definitely available in 2.4. */
-#ifdef __i386__
-# define __ASSUME_VFORK_SYSCALL 1
#endif
/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/getrlimit.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/getrlimit.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003-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
@@ -26,32 +26,8 @@
and the process ID of the new process to the old process. */
ENTRY (__vfork)
-
-#ifdef __NR_vfork
-
DO_CALL (SYS_ify (vfork))
-
-# ifdef __ASSUME_VFORK_SYSCALL
PSEUDO_RET
-# else
- bnslr+
- /* Check if vfork syscall is known at all. */
- cmpwi r3,ENOSYS
- bne- .Lsyscall_error
-
-# endif
-#endif
-
-#ifndef __ASSUME_VFORK_SYSCALL
- /* If we don't have vfork, fork is close enough. */
-
- DO_CALL (SYS_ify (fork))
- bnslr+
-
-.Lsyscall_error:
- b __syscall_error@local
-#endif
-
PSEUDO_END (__vfork)
libc_hidden_def (__vfork)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S Thu Aug 2 00:01:38 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003-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
@@ -27,29 +27,8 @@
ENTRY (__vfork)
CALL_MCOUNT 0
-
-#ifdef __NR_vfork
-
DO_CALL (SYS_ify (vfork))
-
-# ifdef __ASSUME_VFORK_SYSCALL
PSEUDO_RET
-# else
- bnslr+
- /* Check if vfork syscall is known at all. */
- cmpdi r3,ENOSYS
- bne .Local_syscall_error
-
-# endif
-#endif
-
-#ifndef __ASSUME_VFORK_SYSCALL
- /* If we don't have vfork, fork is close enough. */
-
- DO_CALL (SYS_ify (fork))
- PSEUDO_RET
-#endif
-
PSEUDO_END (__vfork)
libc_hidden_def (__vfork)
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/getrlimit.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/getrlimit.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/getrlimit.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fsuid.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fsuid.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/fsuid.h Thu Aug 2 00:01:38 2012
@@ -25,10 +25,10 @@
/* Change uid used for file access control to UID, without affecting
other privileges (such as who can send signals at the process). */
-extern int setfsuid (__uid_t __uid) __THROW;
+extern int setfsuid (__uid_t __uid) __THROW __wur;
/* Ditto for group id. */
-extern int setfsgid (__gid_t __gid) __THROW;
+extern int setfsgid (__gid_t __gid) __THROW __wur;
__END_DECLS
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/syscalls.list Thu Aug 2 00:01:38 2012
@@ -25,6 +25,7 @@
getppid - getppid Ei: __getppid getppid
getresuid - getresuid i:ppp getresuid
getresgid - getresgid i:ppp getresgid
+getrlimit - ugetrlimit i:ip __new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
getsid - getsid i:i getsid
init_module EXTRA init_module 5 init_module
inotify_add_watch EXTRA inotify_add_watch i:isi inotify_add_watch
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/mkostemp.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkostemp64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/mkostemp64.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/mkstemp.c>
Removed: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/mkstemp64.c (removed)
@@ -1,1 +1,0 @@
-#include <sysdeps/wordsize-64/mkstemp64.c>
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofopen.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofopen.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofopen.c (removed)
@@ -1,4 +1,0 @@
-#include "../../libio/iofopen.c"
-
-weak_alias (_IO_new_fopen, _IO_fopen64)
-weak_alias (_IO_new_fopen, fopen64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/iofopen64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/iofopen64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/iofopen64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in iofopen.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/mkostemp.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/mkostemp.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/mkostemp.c (removed)
@@ -1,3 +1,0 @@
-#include "../../misc/mkostemp.c"
-
-weak_alias (mkostemp, mkostemp64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/mkostemp64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/mkostemp64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/mkostemp64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in mkostemp.c. */
Removed: fsf/trunk/libc/sysdeps/wordsize-64/mkstemp.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/mkstemp.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/mkstemp.c (removed)
@@ -1,3 +1,0 @@
-#include "../../misc/mkstemp.c"
-
-weak_alias (mkstemp, mkstemp64)
Removed: fsf/trunk/libc/sysdeps/wordsize-64/mkstemp64.c
==============================================================================
--- fsf/trunk/libc/sysdeps/wordsize-64/mkstemp64.c (original)
+++ fsf/trunk/libc/sysdeps/wordsize-64/mkstemp64.c (removed)
@@ -1,1 +1,0 @@
-/* Defined in mkstemp.c. */
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits