[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r13843 - in /fsf/trunk/libc: ./ localedata/ localedata/locales/ malloc/ sysdeps/unix/sysv/linux/x86_64/sys/

To: commits@xxxxxxxxxx
Subject: [commits] r13843 - in /fsf/trunk/libc: ./ localedata/ localedata/locales/ malloc/ sysdeps/unix/sysv/linux/x86_64/sys/
From: eglibc@xxxxxxxxxx
Date: Mon, 16 May 2011 07:03:16 -0000
Author: eglibc
Date: Mon May 16 00:03:13 2011
New Revision: 13843

Log:
Import glibc-mainline for 2011-05-16

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/se_NO
    fsf/trunk/libc/localedata/locales/sl_SI
    fsf/trunk/libc/malloc/mtrace.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon May 16 00:03:13 2011
@@ -1,3 +1,22 @@
+2011-05-16  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #11820]
+	* sysdeps/unix/sysv/linux/x86_64/sys/user.h
+	(struct user_fpregs_struct): Avoid __uint*_t types.
+
+	[BZ #6420]
+	* malloc/mtrace.c (tr_where): Add additional parameter to point to
+	symbol info.  Use it instead of calling _dl_addr locally.
+	(lock_and_info): New function.
+	(tr_freehook): Call lock_and_info and pass symbol info as additional
+	parameter to tr_where.
+	(tr_mallochook): Likewise.
+	(tr_reallochook): Likewise.
+	(tr_memalignhook): Likewise.
+
+	* malloc/mtrace.c: Remove support for USE_MTRACE_FILE.  It is not
+	used and couldn't be at all thread-safe.
+
 2011-05-15  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* libio/freopen.c (freopen): Don't close old file descriptor

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Mon May 16 00:03:13 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-5-15
+GNU C Library NEWS -- history of user-visible changes.  2011-5-16
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -9,13 +9,13 @@
 
 * The following bugs are resolved with this release:
 
-  386, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258, 11487,
-  11532, 11578, 11653, 11668, 11724, 11901, 11945, 11947, 11952, 12052,
-  12083, 12158, 12178, 12200, 12346, 12393, 12420, 12432, 12445, 12449,
-  12453, 12454, 12460, 12469, 12489, 12509, 12510, 12511, 12518, 12527,
-  12541, 12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625,
-  12626, 12631, 12650, 12653, 12655, 12660, 12681, 12685, 12711, 12713,
-  12714, 12717, 12723, 12724, 12734, 12738
+  386, 6420, 7101, 9730, 9732, 9809, 10138, 10149, 10157, 11257, 11258,
+  11487, 11532, 11578, 11653, 11668, 11724, 11820, 11901, 11945, 11947,
+  11952, 11987, 12052, 12083, 12158, 12178, 12200, 12346, 12393, 12420,
+  12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, 12509, 12510,
+  12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, 12587, 12597,
+  12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, 12660, 12681,
+  12685, 12711, 12713, 12714, 12717, 12723, 12724, 12734, 12738, 12746
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Mon May 16 00:03:13 2011
@@ -1,3 +1,9 @@
+2011-05-16  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #11987]
+	* locales/sl_SI (LC_TIME): Add first_weekday and first_workday.
+	Patch by SaÅ¡o Å½ivanovic <saso.zivanovic@xxxxxxxxxxxxxx>.
+
 2011-05-15  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #9732]
@@ -31,7 +37,7 @@
 	[BZ #11578]
 	* locales/es_PA: Change paper format to letter.
 	* locales/es_SV: Likewise.
-	Patch by Caolán McNamara <caolanm@xxxxxxxxxx>.
+	Patch by CaolÃ¡n McNamara <caolanm@xxxxxxxxxx>.
 
 	[BZ #11653]
 	* locales/es_NI: Fix currency_symbol.
@@ -301,7 +307,7 @@
 	Patch by Petr Machata <pmachata@xxxxxxxxxx>.
 
 	* locales/crh_UA: Fix first day of week and a few spellings.
-	Patch by Reþat SABIQ <tilde.birlik@xxxxxxxxx>.
+	Patch by ReÃ¾at SABIQ <tilde.birlik@xxxxxxxxx>.
 
 2009-10-15  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
@@ -2060,11 +2066,11 @@
 	make it more like the structure of the POSIX locale values.
 	* locales/tr_TR: Correct numeric decimal point to use comma, and
 	correct grouping.
-	Based on patches from Deniz Akkus Kanca and Nilgün Belma Bugüner.
+	Based on patches from Deniz Akkus Kanca and NilgÃ¼n Belma BugÃ¼ner.
 
 	[BZ #421]
 	* locales/tr_TR: Update with new currency symbol valid from
-	2005-01-01.  Patch from Nilgün Belma Bugüner.
+	2005-01-01.  Patch from NilgÃ¼n Belma BugÃ¼ner.
 	* locales/tr_TR: Convert UTF-8 comment to <U#> notation.
 
 2004-10-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
@@ -2137,7 +2143,7 @@
 2004-05-02  Petter Reinholdtsen  <pere@xxxxxxxxxx>
 
 	* locales/nn_NO: Use the same sorting order in Norwegian Nynorsk
-	(nn_NO) as in Norwegian Bokmål (nb_NO). [BZ #74]
+	(nn_NO) as in Norwegian BokmÃ¥l (nb_NO). [BZ #74]
 
 2004-05-03  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
@@ -2631,11 +2637,11 @@
 2003-06-15  Petter Reinholdtsen  <pere@xxxxxxxxxx>
 
 	* locales/fi_FI [LC_TIME]: Correct month names to make the dates
-	gramatically correct.  Patch from Eero Häkkinen. [PR libc/5013].
+	gramatically correct.  Patch from Eero HÃ¤kkinen. [PR libc/5013].
 
 2003-06-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
-	* locales/an_ES: New file.  Contributed by Jordi Mallach Péez.
+	* locales/an_ES: New file.  Contributed by Jordi Mallach PÃ©ez.
 
 2003-06-15  Petter Reinholdtsen  <pere@xxxxxxxxxx>
 
@@ -2656,9 +2662,9 @@
 	Finland
 	* locales/fi_FI [LC_MONETARY]: Correct mon_thousands_sep from
 	period (U002E) to non-break space (U00A0).
-	suggestion from Eero Häkkinen.
+	suggestion from Eero HÃ¤kkinen.
 	[LC_NUMERIC]: Correct thousands_sep from period (U002E) to
-	non-break space (U00A0).  Based on suggestion from Eero Häkkinen.
+	non-break space (U00A0).  Based on suggestion from Eero HÃ¤kkinen.
 
 2003-06-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
@@ -3160,7 +3166,7 @@
 2002-01-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/hu_HU: New version with corrected collation.
-	Patch by Nagy Péter <chichken@xxxxxxxxxxxx>.
+	Patch by Nagy PÃ©ter <chichken@xxxxxxxxxxxx>.
 
 2001-12-28  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
@@ -3205,7 +3211,7 @@
 
 	* charmaps/ISO-8859-16: Swap 0xa5 and 0xab entries.
 
-2001-11-15  Børre Gaup  <boerre.gaup@xxxxx>
+2001-11-15  BÃ¸rre Gaup  <boerre.gaup@xxxxx>
 
 	* locales/se_NO: New file.
 
@@ -3397,7 +3403,7 @@
 2001-05-26  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/ro_RO: Correct abday, day, abmon, and mon info.
-	Patch by Ionel Mugurel Ciobîcã <tgakic@xxxxxxxxxxxxxxxxxx>.
+	Patch by Ionel Mugurel CiobÃ®cÃ£ <tgakic@xxxxxxxxxxxxxxxxxx>.
 
 2001-05-21  Bruno Haible  <haible@xxxxxxxxxxxxxx>
 
@@ -5315,7 +5321,7 @@
 2000-05-04  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* charmaps/ISO-8859-15: Remove incorrect definitions of <So> and <OR>.
-	Reported by Gaël Quéri <gqueri@xxxxxxxxxxxxxx> [PR libc/1718].
+	Reported by GaÃ«l QuÃ©ri <gqueri@xxxxxxxxxxxxxx> [PR libc/1718].
 
 	* tst-fmon.c (main): Print the locale name as well in the error
 	message.
@@ -5464,7 +5470,7 @@
 
 	* locale/en_BW: New file.
 	* locale/en_ZW: New file.
-	Contributed by Schalk W. Cronjé <schalkc@xxxxxxxxxxx>.
+	Contributed by Schalk W. CronjÃ© <schalkc@xxxxxxxxxxx>.
 
 1999-12-21  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
@@ -5474,7 +5480,7 @@
 1999-12-20  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/af_ZA: New file.
-	Contributed by Schalk W. Cronjé <schalkc@xxxxxxxxxxx>.
+	Contributed by Schalk W. CronjÃ© <schalkc@xxxxxxxxxxx>.
 
 1999-12-19  Ulrich Drepper  <drepper@xxxxxxxxxx>
 

Modified: fsf/trunk/libc/localedata/locales/se_NO
==============================================================================
--- fsf/trunk/libc/localedata/locales/se_NO (original)
+++ fsf/trunk/libc/localedata/locales/se_NO Mon May 16 00:03:13 2011
@@ -3,7 +3,7 @@
 %
 % Northern Saami Language Locale for Norway
 % Source: http://www.hum.uit.no/a/trond/loc.html
-% Contact: Børre Gaup
+% Contact: BÃ¸rre Gaup
 % Email: boerre.gaup@xxxxx
 % Language: se
 % Territory: NO
@@ -19,7 +19,7 @@
 title "Northern Saami language locale for Norway"
 source "http://www.hum.uit.no/a/trond/loc.html";
 address ""
-contact "Børre Gaup"
+contact "BÃ¸rre Gaup"
 email "boerre.gaup@xxxxx"
 tel ""
 fax ""
@@ -113,23 +113,23 @@
 <oumlaut>
 
 reorder-after <U0061>
-<U00E0> <agrave>;<GRA>;<MIN>;IGNORE % 201 à
-<U00E1> <aacute>;<ACA>;<MIN>;IGNORE % 200 á
-<U00E2> <acircumflex>;<CIR>;<MIN>;IGNORE % 202 â
-<U00E3> <atilde>;<TIL>;<MIN>;IGNORE % 203 ã
+<U00E0> <agrave>;<GRA>;<MIN>;IGNORE % 201 Ã 
+<U00E1> <aacute>;<ACA>;<MIN>;IGNORE % 200 Ã¡
+<U00E2> <acircumflex>;<CIR>;<MIN>;IGNORE % 202 Ã¢
+<U00E3> <atilde>;<TIL>;<MIN>;IGNORE % 203 Ã£
 
 reorder-after <U0041>
-<U00C0> <agrave>;<GRA>;<CAP>;IGNORE % 321 À
-<U00C1> <aacute>;<ACA>;<CAP>;IGNORE % 320 Á
-<U00C2> <acircumflex>;<CIR>;<CAP>;IGNORE % 322 Â
-<U00C3> <atilde>;<TIL>;<CAP>;IGNORE % 323 Ã
+<U00C0> <agrave>;<GRA>;<CAP>;IGNORE % 321 Ã€
+<U00C1> <aacute>;<ACA>;<CAP>;IGNORE % 320 Ã
+<U00C2> <acircumflex>;<CIR>;<CAP>;IGNORE % 322 Ã‚
+<U00C3> <atilde>;<TIL>;<CAP>;IGNORE % 323 Ãƒ
 
 reorder-after <U0063>
-<U00E7> <ccedilla>;<CDI>;<MIN>;IGNORE % 212 ç
+<U00E7> <ccedilla>;<CDI>;<MIN>;IGNORE % 212 Ã§
 <U010D> <ccaron>;<CAR>;<MIN>;IGNORE % 215 <c<>
 
 reorder-after <U0043>
-<U00C7> <ccedilla>;<CDI>;<CAP>;IGNORE % 332 Ç
+<U00C7> <ccedilla>;<CDI>;<CAP>;IGNORE % 332 Ã‡
 <U010C> <ccaron>;<CAR>;<CAP>;IGNORE % 335 <C<>
 
 reorder-after <U010B>
@@ -141,11 +141,11 @@
 <U01EE> <ezhcaron>;<CAR>;<CAP>;IGNORE % EZH caron
 
 reorder-after <U0064>
-<U00F0> <eth>;<PCL>;<MIN>;IGNORE % 218 ð
+<U00F0> <eth>;<PCL>;<MIN>;IGNORE % 218 Ã°
 <U0111> <dstroke>;<OBL>;<MIN>;IGNORE % 220 <d//>
 
 reorder-after <U0044>
-<U00D0> <eth>;<PCL>;<CAP>;IGNORE % 338 Ð
+<U00D0> <eth>;<PCL>;<CAP>;IGNORE % 338 Ã
 <U0110> <dstroke>;<OBL>;<CAP>;IGNORE % 340 <D//>
 
 reorder-after <U0066>
@@ -165,32 +165,32 @@
 <U01E8> <kcaron>;<CAR>;<CAP>;IGNORE % Kcaron
 
 reorder-after <U0053>
-<U00DF> <ssharp>;"<LIG><LIG>";"<MIN><MIN>";IGNORE % ß
+<U00DF> <ssharp>;"<LIG><LIG>";"<MIN><MIN>";IGNORE % ÃŸ
 <U0161> <scaron>;<CAR>;<MIN>;IGNORE % 288 <s<>
 <U0160> <scaron>;<CAR>;<CAP>;IGNORE % 405 <S<>
 
 
 reorder-after <U00E3>
-<U00E4> <svae>;<REU>;<MIN>;IGNORE % ä
-<U00E5> <aring>;<RNE>;<MIN>;IGNORE % å
-<U00E6> <noae>;<LIG>;<MIN>;IGNORE % æ
+<U00E4> <svae>;<REU>;<MIN>;IGNORE % Ã¤
+<U00E5> <aring>;<RNE>;<MIN>;IGNORE % Ã¥
+<U00E6> <noae>;<LIG>;<MIN>;IGNORE % Ã¦
 reorder-after <U00F5>
-<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % ö
-<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % ø
+<U00F6> <oumlaut>;<REU>;<MIN>;IGNORE % Ã¶
+<U00F8> <oslash>;<OBL>;<MIN>;IGNORE % Ã¸
 
 reorder-after <U00C3>
-<U00C4> <svae>;<REU>;<CAP>;IGNORE % Ä
-<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Å
-<U00C6> <noae>;<LIG>;<CAP>;IGNORE % Æ
+<U00C4> <svae>;<REU>;<CAP>;IGNORE % Ã„
+<U00C5> <aring>;<RNE>;<CAP>;IGNORE % Ã…
+<U00C6> <noae>;<LIG>;<CAP>;IGNORE % Ã†
 reorder-after <U00D5>
-<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ö
-<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ø
-
-% ü/Ü is treated like y/Y but is sorted after the latter
+<U00D6> <oumlaut>;<REU>;<CAP>;IGNORE % Ã–
+<U00D8> <oslash>;<OBL>;<CAP>;IGNORE % Ã˜
+
+% Ã¼/Ãœ is treated like y/Y but is sorted after the latter
 reorder-after <U00FB>
-<U00FC> <y>;<REU>;<MIN>;IGNORE % ü
+<U00FC> <y>;<REU>;<MIN>;IGNORE % Ã¼
 reorder-after <U00DB>
-<U00DC> <y>;<REU>;<CAP>;IGNORE % Ü
+<U00DC> <y>;<REU>;<CAP>;IGNORE % Ãœ
 reorder-end
 
 END LC_COLLATE
@@ -275,7 +275,7 @@
 <U0020><U0062><U002E><U0020><U0025><U0059><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>/
 <U0020><U0025><U005A>"
 
-% %a %b-%e %H:%M:%S %Z %Y søn jan-31 21:15:11 CET 2001
+% %a %b-%e %H:%M:%S %Z %Y sÃ¸n jan-31 21:15:11 CET 2001
 END LC_TIME
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/sl_SI
==============================================================================
--- fsf/trunk/libc/localedata/locales/sl_SI (original)
+++ fsf/trunk/libc/localedata/locales/sl_SI Mon May 16 00:03:13 2011
@@ -2187,6 +2187,8 @@
 date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
+first_weekday 2
+first_workday 2
 END LC_TIME
 
 LC_PAPER

Modified: fsf/trunk/libc/malloc/mtrace.c
==============================================================================
--- fsf/trunk/libc/malloc/mtrace.c (original)
+++ fsf/trunk/libc/malloc/mtrace.c Mon May 16 00:03:13 2011
@@ -1,5 +1,5 @@
 /* More debugging hooks for `malloc'.
-   Copyright (C) 1991-1994,1996-2004, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1991-1994,1996-2004, 2008, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 		 Written April 2, 1991 by John Gilmore of Cygnus Support.
 		 Based on mcheck.c by Mike Haertel.
@@ -56,13 +56,6 @@
 
 /* Address to breakpoint on accesses to... */
 __ptr_t mallwatch;
-
-#ifdef USE_MTRACE_FILE
-/* File name and line number information, for callers that had
-   the foresight to call through a macro.  */
-char *_mtrace_file;
-int _mtrace_line;
-#endif
 
 /* Old hook values.  */
 static void (*tr_old_free_hook) (__ptr_t ptr, const __ptr_t);
@@ -86,53 +79,58 @@
 }
 libc_hidden_def (tr_break)
 
-static void tr_where (const __ptr_t) __THROW internal_function;
+static void tr_where (const __ptr_t, Dl_info *) __THROW internal_function;
 static void
 internal_function
-tr_where (caller)
-     const __ptr_t caller;
-{
-#ifdef USE_MTRACE_FILE
-  if (_mtrace_file)
+tr_where (caller, info)
+     const __ptr_t caller;
+     Dl_info *info;
+{
+  if (caller != NULL)
     {
-      fprintf (mallstream, "@ %s:%d ", _mtrace_file, _mtrace_line);
-      _mtrace_file = NULL;
-    }
-  else
-#endif
-    if (caller != NULL)
-    {
-#ifdef HAVE_ELF
-      Dl_info info;
-      if (_dl_addr (caller, &info, NULL, NULL))
+      if (info != NULL)
 	{
 	  char *buf = (char *) "";
-	  if (info.dli_sname != NULL)
+	  if (info->dli_sname != NULL)
 	    {
-	      size_t len = strlen (info.dli_sname);
+	      size_t len = strlen (info->dli_sname);
 	      buf = alloca (len + 6 + 2 * sizeof (void *));
 
 	      buf[0] = '(';
-	      __stpcpy (_fitoa (caller >= (const __ptr_t) info.dli_saddr
-				? caller - (const __ptr_t) info.dli_saddr
-				: (const __ptr_t) info.dli_saddr - caller,
-				__stpcpy (__mempcpy (buf + 1, info.dli_sname,
+	      __stpcpy (_fitoa (caller >= (const __ptr_t) info->dli_saddr
+				? caller - (const __ptr_t) info->dli_saddr
+				: (const __ptr_t) info->dli_saddr - caller,
+				__stpcpy (__mempcpy (buf + 1, info->dli_sname,
 						     len),
-					  caller >= (__ptr_t) info.dli_saddr
+					  caller >= (__ptr_t) info->dli_saddr
 					  ? "+0x" : "-0x"),
 				16, 0),
 			")");
 	    }
 
 	  fprintf (mallstream, "@ %s%s%s[%p] ",
-		   info.dli_fname ?: "", info.dli_fname ? ":" : "",
+		   info->dli_fname ?: "", info->dli_fname ? ":" : "",
 		   buf, caller);
 	}
       else
-#endif
 	fprintf (mallstream, "@ [%p] ", caller);
     }
 }
+
+
+static Dl_info *
+lock_and_info (const __ptr_t caller, Dl_info *mem)
+{
+  if (caller == NULL)
+    return NULL;
+
+  Dl_info *res = _dl_addr (caller, mem, NULL, NULL) ? mem : NULL;
+
+  __libc_lock_lock (lock);
+
+  return res;
+}
+
 
 static void tr_freehook (__ptr_t, const __ptr_t) __THROW;
 static void
@@ -142,8 +140,10 @@
 {
   if (ptr == NULL)
     return;
-  __libc_lock_lock (lock);
-  tr_where (caller);
+
+  Dl_info mem;
+  Dl_info *info = lock_and_info (caller, &mem);
+  tr_where (caller, info);
   /* Be sure to print it first.  */
   fprintf (mallstream, "- %p\n", ptr);
   __libc_lock_unlock (lock);
@@ -167,7 +167,8 @@
 {
   __ptr_t hdr;
 
-  __libc_lock_lock (lock);
+  Dl_info mem;
+  Dl_info *info = lock_and_info (caller, &mem);
 
   __malloc_hook = tr_old_malloc_hook;
   if (tr_old_malloc_hook != NULL)
@@ -176,7 +177,7 @@
     hdr = (__ptr_t) malloc (size);
   __malloc_hook = tr_mallochook;
 
-  tr_where (caller);
+  tr_where (caller, info);
   /* We could be printing a NULL here; that's OK.  */
   fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
 
@@ -201,7 +202,8 @@
   if (ptr == mallwatch)
     tr_break ();
 
-  __libc_lock_lock (lock);
+  Dl_info mem;
+  Dl_info *info = lock_and_info (caller, &mem);
 
   __free_hook = tr_old_free_hook;
   __malloc_hook = tr_old_malloc_hook;
@@ -214,7 +216,7 @@
   __malloc_hook = tr_mallochook;
   __realloc_hook = tr_reallochook;
 
-  tr_where (caller);
+  tr_where (caller, info);
   if (hdr == NULL)
     /* Failed realloc.  */
     fprintf (mallstream, "! %p %#lx\n", ptr, (unsigned long int) size);
@@ -223,7 +225,7 @@
   else
     {
       fprintf (mallstream, "< %p\n", ptr);
-      tr_where (caller);
+      tr_where (caller, info);
       fprintf (mallstream, "> %p %#lx\n", hdr, (unsigned long int) size);
     }
 
@@ -244,7 +246,8 @@
 {
   __ptr_t hdr;
 
-  __libc_lock_lock (lock);
+  Dl_info mem;
+  Dl_info *info = lock_and_info (caller, &mem);
 
   __memalign_hook = tr_old_memalign_hook;
   __malloc_hook = tr_old_malloc_hook;
@@ -255,7 +258,7 @@
   __memalign_hook = tr_memalignhook;
   __malloc_hook = tr_mallochook;
 
-  tr_where (caller);
+  tr_where (caller, info);
   /* We could be printing a NULL here; that's OK.  */
   fprintf (mallstream, "+ %p %#lx\n", hdr, (unsigned long int) size);
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h Mon May 16 00:03:13 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2004, 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
@@ -29,48 +29,48 @@
 
 struct user_fpregs_struct
 {
-  __uint16_t		cwd;
-  __uint16_t		swd;
-  __uint16_t		ftw;
-  __uint16_t		fop;
-  __uint64_t		rip;
-  __uint64_t		rdp;
-  __uint32_t		mxcsr;
-  __uint32_t		mxcr_mask;
-  __uint32_t		st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
-  __uint32_t		xmm_space[64];  /* 16*16 bytes for each XMM-reg = 256 bytes */
-  __uint32_t		padding[24];
+  unsigned short int	cwd;
+  unsigned short int	swd;
+  unsigned short int	ftw;
+  unsigned short int	fop;
+  unsigned long int	rip;
+  unsigned long int	rdp;
+  unsigned int		mxcsr;
+  unsigned int		mxcr_mask;
+  unsigned int		st_space[32];   /* 8*16 bytes for each FP-reg = 128 bytes */
+  unsigned int		xmm_space[64];  /* 16*16 bytes for each XMM-reg = 256 bytes */
+  unsigned int		padding[24];
 };
 
 struct user_regs_struct
 {
-  unsigned long r15;
-  unsigned long r14;
-  unsigned long r13;
-  unsigned long r12;
-  unsigned long rbp;
-  unsigned long rbx;
-  unsigned long r11;
-  unsigned long r10;
-  unsigned long r9;
-  unsigned long r8;
-  unsigned long rax;
-  unsigned long rcx;
-  unsigned long rdx;
-  unsigned long rsi;
-  unsigned long rdi;
-  unsigned long orig_rax;
-  unsigned long rip;
-  unsigned long cs;
-  unsigned long eflags;
-  unsigned long rsp;
-  unsigned long ss;
-  unsigned long fs_base;
-  unsigned long gs_base;
-  unsigned long ds;
-  unsigned long es;
-  unsigned long fs;
-  unsigned long gs;
+  unsigned long int r15;
+  unsigned long int r14;
+  unsigned long int r13;
+  unsigned long int r12;
+  unsigned long int rbp;
+  unsigned long int rbx;
+  unsigned long int r11;
+  unsigned long int r10;
+  unsigned long int r9;
+  unsigned long int r8;
+  unsigned long int rax;
+  unsigned long int rcx;
+  unsigned long int rdx;
+  unsigned long int rsi;
+  unsigned long int rdi;
+  unsigned long int orig_rax;
+  unsigned long int rip;
+  unsigned long int intcs;
+  unsigned long int eflags;
+  unsigned long int rsp;
+  unsigned long int ss;
+  unsigned long int fs_base;
+  unsigned long int gs_base;
+  unsigned long int ds;
+  unsigned long int es;
+  unsigned long int fs;
+  unsigned long int gs;
 };
 
 struct user
@@ -81,8 +81,8 @@
   unsigned long int		u_tsize;
   unsigned long int		u_dsize;
   unsigned long int		u_ssize;
-  unsigned long			start_code;
-  unsigned long			start_stack;
+  unsigned long int		start_code;
+  unsigned long int		start_stack;
   long int			signal;
   int				reserved;
   struct user_regs_struct*	u_ar0;
@@ -152,8 +152,8 @@
   unsigned long int		u_tsize;
   unsigned long int		u_dsize;
   unsigned long int		u_ssize;
-  unsigned long			start_code;
-  unsigned long			start_stack;
+  unsigned long int		start_code;
+  unsigned long int		start_stack;
   long int			signal;
   int				reserved;
   struct user_regs_struct*	u_ar0;
Prev by Date: [commits] r13833 - in /fsf/trunk/libc: ./ include/ io/ libio/ locale/ localedata/ localedata/locales/ posix/ scripts/ sysdeps/generic/...
Next by Date: [commits] r13853 - in /fsf/trunk/libc: ChangeLog NEWS login/programs/pt_chown.c misc/error.c misc/pselect.c posix/regex.h stdlib/putenv.c
Previous by thread: [commits] r13833 - in /fsf/trunk/libc: ./ include/ io/ libio/ locale/ localedata/ localedata/locales/ posix/ scripts/ sysdeps/generic/...
Next by thread: [commits] r13853 - in /fsf/trunk/libc: ChangeLog NEWS login/programs/pt_chown.c misc/error.c misc/pselect.c posix/regex.h stdlib/putenv.c
Index(es):
- Date
- Thread