[Commits] r16334 - in /branches/eglibc-2_11: ./ ports/ ports/sysdeps/arm/ ports/sysdeps/hppa/ ports/sysdeps/mips/

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Dec 22 19:29:40 2011
New Revision: 16334

Log:
Merge changes between r15872 and r16333 from /fsf/glibc-2_11-branch.

Modified:
    branches/eglibc-2_11/   (props changed)
    branches/eglibc-2_11/ports/ChangeLog.arm
    branches/eglibc-2_11/ports/ChangeLog.hppa
    branches/eglibc-2_11/ports/ChangeLog.mips
    branches/eglibc-2_11/ports/sysdeps/arm/dl-tls.h
    branches/eglibc-2_11/ports/sysdeps/hppa/dl-tls.h
    branches/eglibc-2_11/ports/sysdeps/mips/dl-tls.h

Propchange: branches/eglibc-2_11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 19:29:40 2011
@@ -1,1 +1,1 @@
-/fsf/glibc-2_11-branch:15228-15872
+/fsf/glibc-2_11-branch:15228-16333

Modified: branches/eglibc-2_11/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_11/ports/ChangeLog.arm Thu Dec 22 19:29:40 2011
@@ -1,3 +1,7 @@
+2011-04-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/dl-tls.h (TLS_DTV_UNALLOCATED): Define.
+
 2011-06-30  Richard Sandiford  <richard.sandiford@xxxxxxxxxx>
 
 	* sysdeps/arm/elf/start.S (_start): Align the constant pool to 4 bytes.

Modified: branches/eglibc-2_11/ports/ChangeLog.hppa
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.hppa (original)
+++ branches/eglibc-2_11/ports/ChangeLog.hppa Thu Dec 22 19:29:40 2011
@@ -1,3 +1,8 @@
+2011-10-20  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/hppa/dl-tls.h: Update copyright year.
+	Define TLS_DTV_UNALLOCATED.
+
 2009-11-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	[BZ #6676]

Modified: branches/eglibc-2_11/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_11/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_11/ports/ChangeLog.mips Thu Dec 22 19:29:40 2011
@@ -1,3 +1,7 @@
+2011-04-11  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/mips/dl-tls.h (TLS_DTV_UNALLOCATED): Define.
+
 2011-11-17  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/mips64/n64/ftw.c,

Modified: branches/eglibc-2_11/ports/sysdeps/arm/dl-tls.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/arm/dl-tls.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/arm/dl-tls.h Thu Dec 22 19:29:40 2011
@@ -1,5 +1,5 @@
 /* Thread-local storage handling in the ELF dynamic linker.  ARM version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2011 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,3 +27,6 @@
 
 
 extern void *__tls_get_addr (tls_index *ti);
+
+/* Value used for dtv entries for which the allocation is delayed.  */
+#define TLS_DTV_UNALLOCATED	((void *) -1l)

Modified: branches/eglibc-2_11/ports/sysdeps/hppa/dl-tls.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/hppa/dl-tls.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/hppa/dl-tls.h Thu Dec 22 19:29:40 2011
@@ -1,5 +1,5 @@
 /* Thread-local storage handling in the ELF dynamic linker.  hppa version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2011 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,3 +27,6 @@
 
 
 extern void *__tls_get_addr (tls_index *ti);
+
+/* Value used for dtv entries for which the allocation is delayed.  */
+#define TLS_DTV_UNALLOCATED	((void *) -1l)

Modified: branches/eglibc-2_11/ports/sysdeps/mips/dl-tls.h
==============================================================================
--- branches/eglibc-2_11/ports/sysdeps/mips/dl-tls.h (original)
+++ branches/eglibc-2_11/ports/sysdeps/mips/dl-tls.h Thu Dec 22 19:29:40 2011
@@ -1,5 +1,5 @@
 /* Thread-local storage handling in the ELF dynamic linker.  MIPS version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2011 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
@@ -44,3 +44,6 @@
 
 # define GET_ADDR_OFFSET	(ti->ti_offset + TLS_DTV_OFFSET)
 # define __TLS_GET_ADDR(__ti)	(__tls_get_addr (__ti) - TLS_DTV_OFFSET)
+
+/* Value used for dtv entries for which the allocation is delayed.  */
+#define TLS_DTV_UNALLOCATED	((void *) -1l)

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits