[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r4540 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/x86_64/ sysdeps/unix/sysv/linux/x86_64/ sysdeps/unix/sysv/linux/x86_64/bits/
- To: commits@xxxxxxxxxx
- Subject: [commits] r4540 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/x86_64/ sysdeps/unix/sysv/linux/x86_64/ sysdeps/unix/sysv/linux/x86_64/bits/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 15 Dec 2007 08:04:20 -0000
Author: eglibc
Date: Sat Dec 15 00:04:18 2007
New Revision: 4540
Log:
Import glibc-mainline for 2007-12-15
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/allocatestack.c
fsf/trunk/libc/nptl/sysdeps/x86_64/pthreaddef.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Dec 15 00:04:18 2007
@@ -1,3 +1,13 @@
+2007-12-14 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/sysdep.h (INTERNAL_SYSCALL_ERROR_P):
+ First cast argument to long
+ * sysdeps/unix/sysv/linux/x86_64/init-first.c (__vdso_gettimeofday):
+ Return long.
+ (__vdso_clock_gettime): Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h: Functions
+ return long.
+
2007-12-13 Ulrich Drepper <drepper@xxxxxxxxxx>
* locale/nl_langinfo.c (nl_langinfo): Just call __nl_langinfo_l.
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sat Dec 15 00:04:18 2007
@@ -1,3 +1,10 @@
+2007-12-14 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/x86_64/pthreaddef.h (ARCH_RETRY_MMAP): Take additional
+ parameter. Passed it as permission to mmap.
+ * allocatestack.c (allocate_stack): Pass prot as second parameter
+ to ARCH_RETRY_MMAP.
+
2007-12-12 Ulrich Drepper <drepper@xxxxxxxxxx>
* tst-basic7.c: Allocate memory for the stack.
Modified: fsf/trunk/libc/nptl/allocatestack.c
==============================================================================
--- fsf/trunk/libc/nptl/allocatestack.c (original)
+++ fsf/trunk/libc/nptl/allocatestack.c Sat Dec 15 00:04:18 2007
@@ -459,7 +459,7 @@
if (__builtin_expect (mem == MAP_FAILED, 0))
{
#ifdef ARCH_RETRY_MMAP
- mem = ARCH_RETRY_MMAP (size);
+ mem = ARCH_RETRY_MMAP (size, prot);
if (__builtin_expect (mem == MAP_FAILED, 0))
#endif
{
Modified: fsf/trunk/libc/nptl/sysdeps/x86_64/pthreaddef.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/x86_64/pthreaddef.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/x86_64/pthreaddef.h Sat Dec 15 00:04:18 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -42,9 +42,8 @@
/* If it is not possible to allocate memory there retry without that
flag. */
-#define ARCH_RETRY_MMAP(size) \
- mmap (NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, \
- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)
+#define ARCH_RETRY_MMAP(size, prot) \
+ mmap (NULL, size, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)
/* XXX Until we have a better place keep the definitions here. */
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/bits/libc-vdso.h Sat Dec 15 00:04:18 2007
@@ -25,10 +25,10 @@
#ifdef SHARED
-extern int (*__vdso_gettimeofday) (struct timeval *, void *)
+extern long int (*__vdso_gettimeofday) (struct timeval *, void *)
attribute_hidden;
-extern int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
+extern long int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
#endif
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/init-first.c Sat Dec 15 00:04:18 2007
@@ -20,9 +20,9 @@
# include <dl-vdso.h>
# include <bits/libc-vdso.h>
-int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
+long int (*__vdso_gettimeofday) (struct timeval *, void *) attribute_hidden;
-int (*__vdso_clock_gettime) (clockid_t, struct timespec *)
+long int (*__vdso_clock_gettime) (clockid_t, struct timespec *)
__attribute__ ((nocommon));
strong_alias (__vdso_clock_gettime, __GI___vdso_clock_gettime attribute_hidden)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h Sat Dec 15 00:04:18 2007
@@ -224,34 +224,34 @@
# undef INLINE_SYSCALL
# define INLINE_SYSCALL(name, nr, args...) \
({ \
- unsigned long resultvar = INTERNAL_SYSCALL (name, , nr, args); \
+ unsigned long int resultvar = INTERNAL_SYSCALL (name, , nr, args); \
if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (resultvar, ), 0)) \
{ \
__set_errno (INTERNAL_SYSCALL_ERRNO (resultvar, )); \
- resultvar = (unsigned long) -1; \
+ resultvar = (unsigned long int) -1; \
} \
- (long) resultvar; })
+ (long int) resultvar; })
# undef INTERNAL_SYSCALL_DECL
# define INTERNAL_SYSCALL_DECL(err) do { } while (0)
# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
({ \
- unsigned long resultvar; \
+ unsigned long int resultvar; \
LOAD_ARGS_##nr (args) \
LOAD_REGS_##nr \
asm volatile ( \
"syscall\n\t" \
: "=a" (resultvar) \
: "0" (name) ASM_ARGS_##nr : "memory", "cc", "r11", "cx"); \
- (long) resultvar; })
+ (long int) resultvar; })
# undef INTERNAL_SYSCALL
# define INTERNAL_SYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, ##args)
# undef INTERNAL_SYSCALL_ERROR_P
# define INTERNAL_SYSCALL_ERROR_P(val, err) \
- ((unsigned long) (val) >= -4095L)
+ ((unsigned long int) (long int) (val) >= -4095L)
# undef INTERNAL_SYSCALL_ERRNO
# define INTERNAL_SYSCALL_ERRNO(val, err) (-(val))
@@ -319,7 +319,7 @@
# define ASM_ARGS_0
# define LOAD_ARGS_1(a1) \
- long int __arg1 = (long) (a1); \
+ long int __arg1 = (long int) (a1); \
LOAD_ARGS_0 ()
# define LOAD_REGS_1 \
register long int _a1 asm ("rdi") = __arg1; \
@@ -327,7 +327,7 @@
# define ASM_ARGS_1 ASM_ARGS_0, "r" (_a1)
# define LOAD_ARGS_2(a1, a2) \
- long int __arg2 = (long) (a2); \
+ long int __arg2 = (long int) (a2); \
LOAD_ARGS_1 (a1)
# define LOAD_REGS_2 \
register long int _a2 asm ("rsi") = __arg2; \
@@ -335,7 +335,7 @@
# define ASM_ARGS_2 ASM_ARGS_1, "r" (_a2)
# define LOAD_ARGS_3(a1, a2, a3) \
- long int __arg3 = (long) (a3); \
+ long int __arg3 = (long int) (a3); \
LOAD_ARGS_2 (a1, a2)
# define LOAD_REGS_3 \
register long int _a3 asm ("rdx") = __arg3; \
@@ -343,7 +343,7 @@
# define ASM_ARGS_3 ASM_ARGS_2, "r" (_a3)
# define LOAD_ARGS_4(a1, a2, a3, a4) \
- long int __arg4 = (long) (a4); \
+ long int __arg4 = (long int) (a4); \
LOAD_ARGS_3 (a1, a2, a3)
# define LOAD_REGS_4 \
register long int _a4 asm ("r10") = __arg4; \
@@ -351,7 +351,7 @@
# define ASM_ARGS_4 ASM_ARGS_3, "r" (_a4)
# define LOAD_ARGS_5(a1, a2, a3, a4, a5) \
- long int __arg5 = (long) (a5); \
+ long int __arg5 = (long int) (a5); \
LOAD_ARGS_4 (a1, a2, a3, a4)
# define LOAD_REGS_5 \
register long int _a5 asm ("r8") = __arg5; \
@@ -359,7 +359,7 @@
# define ASM_ARGS_5 ASM_ARGS_4, "r" (_a5)
# define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6) \
- long int __arg6 = (long) (a6); \
+ long int __arg6 = (long int) (a6); \
LOAD_ARGS_5 (a1, a2, a3, a4, a5)
# define LOAD_REGS_6 \
register long int _a6 asm ("r9") = __arg6; \