[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r10689 - in /branches/eglibc-2_12: libc/ libc/elf/ libc/sunrpc/ libc/sysdeps/unix/sysv/linux/ libc/sysdeps/unix/sysv/linux/s...
- To: commits@xxxxxxxxxx
- Subject: [commits] r10689 - in /branches/eglibc-2_12: libc/ libc/elf/ libc/sunrpc/ libc/sysdeps/unix/sysv/linux/ libc/sysdeps/unix/sysv/linux/s...
- From: joseph@xxxxxxxxxx
- Date: Thu, 10 Jun 2010 19:19:02 -0000
Author: joseph
Date: Thu Jun 10 12:19:01 2010
New Revision: 10689
Log:
Merge changes between r10493 and r10688 from /fsf/glibc-2_12-branch.
Added:
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/internal_recvmmsg.S
- copied unchanged from r10688, fsf/glibc-2_12-branch/libc/sysdeps/unix/sysv/linux/internal_recvmmsg.S
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/recvmmsg.c
- copied unchanged from r10688, fsf/glibc-2_12-branch/libc/sysdeps/unix/sysv/linux/recvmmsg.c
branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
- copied unchanged from r10688, fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S
branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
- copied unchanged from r10688, fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S
branches/eglibc-2_12/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
- copied unchanged from r10688, fsf/glibc-2_12-branch/ports/sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c
Modified:
branches/eglibc-2_12/libc/ChangeLog
branches/eglibc-2_12/libc/elf/dl-runtime.c
branches/eglibc-2_12/libc/sunrpc/clnt_tcp.c
branches/eglibc-2_12/libc/sunrpc/clnt_udp.c
branches/eglibc-2_12/libc/sunrpc/clnt_unix.c
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/Makefile
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/kernel-features.h
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/socketcall.h
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sys/timex.h
branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/syscalls.list
branches/eglibc-2_12/libc/sysdeps/x86_64/multiarch/init-arch.c
branches/eglibc-2_12/ports/ChangeLog.arm
branches/eglibc-2_12/ports/ChangeLog.mips
Modified: branches/eglibc-2_12/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_12/libc/ChangeLog (original)
+++ branches/eglibc-2_12/libc/ChangeLog Thu Jun 10 12:19:01 2010
@@ -1,3 +1,42 @@
+2010-05-26 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #11640]
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+ Properly check family and model.
+
+2010-05-26 Takashi Yoshii <takashi.yoshii.zj@xxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Fix iov[] size.
+
+2010-05-21 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * elf/dl-runtime.c (_dl_profile_fixup): Don't crash on unresolved weak
+ symbol reference.
+
+2010-05-19 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * elf/dl-runtime.c (_dl_fixup): Don't crash on unresolved weak
+ symbol reference.
+
+2010-05-21 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add recvmmsg
+ and internal_recvmmsg.
+ * sysdeps/unix/sysv/linux/recvmmsg.c: New file.
+ * sysdeps/unix/sysv/linux/internal_recvmmsg.S: New file.
+ * sysdeps/unix/sysv/linux/socketcall.h (SOCKOP_recvmmsg): Define.
+ * sysdeps/unix/sysv/linux/syscalls.list (recvmmsg): Remove.
+
+2010-05-21 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sunrpc/clnt_tcp.c (clnttcp_control): Add missing break.
+ * sunrpc/clnt_udp.c (clntudp_control): Likewise.
+ * sunrpc/clnt_unix.c (clntunix_control): Likewise.
+
+2010-05-20 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sys/timex.h: Use __REDIRECT_NTH.
+
2010-05-12 Andrew Stubbs <ams@xxxxxxxxxxxxxxxx>
* sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Really disable all
Modified: branches/eglibc-2_12/libc/elf/dl-runtime.c
==============================================================================
--- branches/eglibc-2_12/libc/elf/dl-runtime.c (original)
+++ branches/eglibc-2_12/libc/elf/dl-runtime.c Thu Jun 10 12:19:01 2010
@@ -1,5 +1,5 @@
/* On-demand PLT fixup for shared objects.
- Copyright (C) 1995-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-2009, 2010 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
@@ -144,7 +144,8 @@
/* And now perhaps the relocation addend. */
value = elf_machine_plt_value (l, reloc, value);
- if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
+ if (sym != NULL
+ && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
value = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
/* Finally, fix up the plt itself. */
@@ -231,8 +232,9 @@
? LOOKUP_VALUE_ADDRESS (result)
+ defsym->st_value : 0);
- if (__builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
- == STT_GNU_IFUNC, 0))
+ if (defsym != NULL
+ && __builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
+ == STT_GNU_IFUNC, 0))
value = ((DL_FIXUP_VALUE_TYPE (*) (void))
DL_FIXUP_VALUE_ADDR (value)) ();
}
@@ -369,7 +371,7 @@
struct audit_ifaces *afct = GLRO(dl_audit);
for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
{
- if (afct->ARCH_LA_PLTENTER != NULL
+ if (afct->ARCH_LA_PLTENTER != NULL
&& (reloc_result->enterexit
& (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0)
{
Modified: branches/eglibc-2_12/libc/sunrpc/clnt_tcp.c
==============================================================================
--- branches/eglibc-2_12/libc/sunrpc/clnt_tcp.c (original)
+++ branches/eglibc-2_12/libc/sunrpc/clnt_tcp.c Thu Jun 10 12:19:01 2010
@@ -399,6 +399,7 @@
/* This will set the xid of the NEXT call */
*(u_long *)ct->ct_mcall = htonl (*(u_long *)info - 1);
/* decrement by 1 as clnttcp_call() increments once */
+ break;
case CLGET_VERS:
/*
* This RELIES on the information that, in the call body,
Modified: branches/eglibc-2_12/libc/sunrpc/clnt_udp.c
==============================================================================
--- branches/eglibc-2_12/libc/sunrpc/clnt_udp.c (original)
+++ branches/eglibc-2_12/libc/sunrpc/clnt_udp.c Thu Jun 10 12:19:01 2010
@@ -582,6 +582,7 @@
/* This will set the xid of the NEXT call */
*(u_long *)cu->cu_outbuf = htonl(*(u_long *)info - 1);
/* decrement by 1 as clntudp_call() increments once */
+ break;
case CLGET_VERS:
/*
* This RELIES on the information that, in the call body,
Modified: branches/eglibc-2_12/libc/sunrpc/clnt_unix.c
==============================================================================
--- branches/eglibc-2_12/libc/sunrpc/clnt_unix.c (original)
+++ branches/eglibc-2_12/libc/sunrpc/clnt_unix.c Thu Jun 10 12:19:01 2010
@@ -376,6 +376,7 @@
/* This will set the xid of the NEXT call */
*(u_long *) ct->ct_mcall = htonl (*(u_long *)info - 1);
/* decrement by 1 as clntunix_call() increments once */
+ break;
case CLGET_VERS:
/*
* This RELIES on the information that, in the call body,
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/Makefile
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/Makefile (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/Makefile Thu Jun 10 12:19:01 2010
@@ -12,7 +12,7 @@
endif
ifeq ($(subdir),socket)
-sysdep_routines += internal_accept4
+sysdep_routines += internal_accept4 recvmmsg internal_recvmmsg
endif
ifeq ($(subdir),misc)
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/kernel-features.h Thu Jun 10 12:19:01 2010
@@ -525,3 +525,8 @@
#if __LINUX_KERNEL_VERSION >= 0x020620
# define __ASSUME_F_GETOWN_EX 1
#endif
+
+/* Support for the recvmmsg syscall was added in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG 1
+#endif
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h Thu Jun 10 12:19:01 2010
@@ -1,5 +1,5 @@
/* Dump registers.
- Copyright (C) 1999, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2009, 2010 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
@@ -58,7 +58,7 @@
{
char regs[22][8];
char fpregs[34][8];
- struct iovec iov[112];
+ struct iovec iov[22 * 2 + 34 * 2 + 2];
size_t nr = 0;
#define ADD_STRING(str) \
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/socketcall.h
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/socketcall.h (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/socketcall.h Thu Jun 10 12:19:01 2010
@@ -44,5 +44,6 @@
#define SOCKOP_sendmsg 16
#define SOCKOP_recvmsg 17
#define SOCKOP_accept4 18
+#define SOCKOP_recvmmsg 19
#endif /* sys/socketcall.h */
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sys/timex.h
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sys/timex.h (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/sys/timex.h Thu Jun 10 12:19:01 2010
@@ -140,9 +140,9 @@
extern int __adjtimex (struct timex *__ntx) __THROW;
extern int adjtimex (struct timex *__ntx) __THROW;
-#if defined __GNUC__ && __GNUC__ >= 2
-extern int ntp_gettime (struct ntptimeval *__ntv)
- __asm__ ("ntp_gettimex") __THROW;
+#ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv),
+ ntp_gettimex);
#else
extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW;
# define ntp_gettime ntp_gettimex
Modified: branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/syscalls.list
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/syscalls.list (original)
+++ branches/eglibc-2_12/libc/sysdeps/unix/sysv/linux/syscalls.list Thu Jun 10 12:19:01 2010
@@ -53,7 +53,6 @@
putpmsg - putpmsg i:ippii putpmsg
query_module EXTRA query_module i:sipip query_module
quotactl EXTRA quotactl i:isip quotactl
-recvmmsg EXTRA recvmmsg Ci:ipiip recvmmsg
remap_file_pages - remap_file_pages i:piiii __remap_file_pages remap_file_pages
sched_getp - sched_getparam i:ip __sched_getparam sched_getparam
sched_gets - sched_getscheduler i:i __sched_getscheduler sched_getscheduler
Modified: branches/eglibc-2_12/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- branches/eglibc-2_12/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ branches/eglibc-2_12/libc/sysdeps/x86_64/multiarch/init-arch.c Thu Jun 10 12:19:01 2010
@@ -62,15 +62,15 @@
unsigned int eax = __cpu_features.cpuid[COMMON_CPUID_INDEX_1].eax;
unsigned int extended_family = (eax >> 20) & 0xff;
unsigned int extended_model = (eax >> 12) & 0xf0;
- if (__cpu_features.family == 0x0f)
+ if (family == 0x0f)
{
family += extended_family;
model += extended_model;
}
- else if (__cpu_features.family == 0x06)
+ else if (family == 0x06)
{
model += extended_model;
- switch (__cpu_features.model)
+ switch (model)
{
case 0x1a:
case 0x1e:
Modified: branches/eglibc-2_12/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_12/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_12/ports/ChangeLog.arm Thu Jun 10 12:19:01 2010
@@ -1,3 +1,7 @@
+2010-05-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/eabi/internal_recvmmsg.S: New.
+
2010-04-08 Daniel Jacobowitz <dan@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S: New file.
Modified: branches/eglibc-2_12/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_12/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_12/ports/ChangeLog.mips Thu Jun 10 12:19:01 2010
@@ -1,3 +1,8 @@
+2010-05-21 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c,
+ sysdeps/unix/sysv/linux/mips/mips32/internal_recvmmsg.S: New.
+
2010-04-14 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/unix/sysv/linux/mips/libc-abis: New.