[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r10690 - in /branches/eglibc-2_11/libc: ./ elf/ sunrpc/ sysdeps/sh/sh4/fpu/ sysdeps/unix/sysv/linux/sh/sh4/ sysdeps/x86_64/m...

To: commits@xxxxxxxxxx
Subject: [commits] r10690 - in /branches/eglibc-2_11/libc: ./ elf/ sunrpc/ sysdeps/sh/sh4/fpu/ sysdeps/unix/sysv/linux/sh/sh4/ sysdeps/x86_64/m...
From: joseph@xxxxxxxxxx
Date: Thu, 10 Jun 2010 19:20:45 -0000

Author: joseph
Date: Thu Jun 10 12:20:45 2010
New Revision: 10690

Log:
Merge changes between r10453 and r10689 from /fsf/glibc-2_11-branch.

Modified:
    branches/eglibc-2_11/libc/ChangeLog
    branches/eglibc-2_11/libc/elf/dl-runtime.c
    branches/eglibc-2_11/libc/sunrpc/clnt_tcp.c
    branches/eglibc-2_11/libc/sunrpc/clnt_udp.c
    branches/eglibc-2_11/libc/sunrpc/clnt_unix.c
    branches/eglibc-2_11/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c
    branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
    branches/eglibc-2_11/libc/sysdeps/x86_64/multiarch/init-arch.c
    branches/eglibc-2_11/libc/version.h

Modified: branches/eglibc-2_11/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_11/libc/ChangeLog (original)
+++ branches/eglibc-2_11/libc/ChangeLog Thu Jun 10 12:20:45 2010
@@ -1,3 +1,34 @@
+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>
+
+	* 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-12  Andrew Stubbs  <ams@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/sh/sh4/fpu/feholdexcpt.c (feholdexcept): Really disable all
+	exceptions.  Return 0.
+
 2010-05-07  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* elf/ldconfig.c (main): Add a const.

Modified: branches/eglibc-2_11/libc/elf/dl-runtime.c
==============================================================================
--- branches/eglibc-2_11/libc/elf/dl-runtime.c (original)
+++ branches/eglibc-2_11/libc/elf/dl-runtime.c Thu Jun 10 12:20:45 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_11/libc/sunrpc/clnt_tcp.c
==============================================================================
--- branches/eglibc-2_11/libc/sunrpc/clnt_tcp.c (original)
+++ branches/eglibc-2_11/libc/sunrpc/clnt_tcp.c Thu Jun 10 12:20:45 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_11/libc/sunrpc/clnt_udp.c
==============================================================================
--- branches/eglibc-2_11/libc/sunrpc/clnt_udp.c (original)
+++ branches/eglibc-2_11/libc/sunrpc/clnt_udp.c Thu Jun 10 12:20:45 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_11/libc/sunrpc/clnt_unix.c
==============================================================================
--- branches/eglibc-2_11/libc/sunrpc/clnt_unix.c (original)
+++ branches/eglibc-2_11/libc/sunrpc/clnt_unix.c Thu Jun 10 12:20:45 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_11/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c (original)
+++ branches/eglibc-2_11/libc/sysdeps/sh/sh4/fpu/feholdexcpt.c Thu Jun 10 12:20:45 2010
@@ -1,5 +1,6 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 1997, 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2005, 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
@@ -29,10 +30,15 @@
   _FPU_GETCW (temp);
   envp->__fpscr = temp;
 
+  /* Clear the status flags.  */
+  temp &= ~FE_ALL_EXCEPT;
+
   /* Now set all exceptions to non-stop.  */
-  temp &= ~FE_ALL_EXCEPT;
+  temp &= ~(FE_ALL_EXCEPT << 5);
+
   _FPU_SETCW (temp);
 
-  return 1;
+  /* Success.  */
+  return 0;
 }
 libm_hidden_def (feholdexcept)

Modified: branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h (original)
+++ branches/eglibc-2_11/libc/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h Thu Jun 10 12:20:45 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_11/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- branches/eglibc-2_11/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ branches/eglibc-2_11/libc/sysdeps/x86_64/multiarch/init-arch.c Thu Jun 10 12:20:45 2010
@@ -62,12 +62,12 @@
       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;
     }
   /* This spells out "AuthenticAMD".  */

Modified: branches/eglibc-2_11/libc/version.h
==============================================================================
--- branches/eglibc-2_11/libc/version.h (original)
+++ branches/eglibc-2_11/libc/version.h Thu Jun 10 12:20:45 2010
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "stable"
-#define VERSION "2.11.1"
+#define VERSION "2.11.2"

Prev by Date: [commits] r10689 - in /branches/eglibc-2_12: libc/ libc/elf/ libc/sunrpc/ libc/sysdeps/unix/sysv/linux/ libc/sysdeps/unix/sysv/linux/s...
Next by Date: [commits] r10700 - in /fsf/trunk/ports: ChangeLog.m68k sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
Previous by thread: [commits] r10689 - in /branches/eglibc-2_12: libc/ libc/elf/ libc/sunrpc/ libc/sysdeps/unix/sysv/linux/ libc/sysdeps/unix/sysv/linux/s...
Next by thread: [commits] r10700 - in /fsf/trunk/ports: ChangeLog.m68k sysdeps/unix/sysv/linux/m68k/nptl/bits/pthreadtypes.h
Index(es):
- Date
- Thread