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

[Commits] r18040 - in /fsf/trunk/libc: ./ elf/ locale/ localedata/ localedata/locales/ sysdeps/unix/sysv/linux/sparc/sparc64/ sysdeps/...



Author: eglibc
Date: Sat Apr 14 00:01:34 2012
New Revision: 18040

Log:
Import glibc-mainline for 2012-04-14

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/elf/tst-auditmod1.c
    fsf/trunk/libc/elf/tst-auditmod3b.c
    fsf/trunk/libc/elf/tst-auditmod4b.c
    fsf/trunk/libc/elf/tst-auditmod5b.c
    fsf/trunk/libc/elf/tst-auditmod6b.c
    fsf/trunk/libc/elf/tst-auditmod6c.c
    fsf/trunk/libc/elf/tst-auditmod7b.c
    fsf/trunk/libc/locale/iso-639.def
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/cy_GB
    fsf/trunk/libc/localedata/locales/en_GB
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
    fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h
    fsf/trunk/libc/sysdeps/x86_64/ffsll.c
    fsf/trunk/libc/sysdeps/x86_64/preconfigure
    fsf/trunk/libc/sysdeps/x86_64/preconfigure.in

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Apr 14 00:01:34 2012
@@ -1,3 +1,32 @@
+2012-04-13  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* elf/tst-auditmod1.c: Check __ILP32__ instead of __LP64__.
+	* elf/tst-auditmod3b.c: Likewise.
+	* elf/tst-auditmod4b.c: Likewise.
+	* elf/tst-auditmod5b.c: Likewise.
+	* elf/tst-auditmod6b.c: Likewise.
+	* elf/tst-auditmod6c.c: Likewise.
+	* elf/tst-auditmod7b.c: Likewise.
+	* sysdeps/x86_64/ffsll.c (ffsl): Likewise.
+	* sysdeps/x86_64/preconfigure.in: Likewise.
+	* sysdeps/x86_64/preconfigure: Regenerated.
+
+2012-04-13  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* sysdeps/x86_64/bits/wordsize.h (__WORDSIZE): Also check
+	__ILP32__.
+
+2012-04-13  Antoine Balestrat <merkil33@xxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
+	(__get_clockfreq_via_proc_openprom): Fix test on wrong variable.
+
+2012-04-13  Chris Leonard  <cjlhomeaddress@xxxxxxxxx>
+
+	[BZ #13973]
+	* locale/iso-639.def: Fix gl language name. Spotted by
+	Yaron Shahrabani.
+
 2012-04-12  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	[BZ #2074]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Apr 14 00:01:34 2012
@@ -10,18 +10,18 @@
 * The following bugs are resolved with this release:
 
   174, 350, 369, 411, 706, 2074, 2541, 2547, 2548, 2551, 2552, 2553, 2554,
-  2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3866, 3868, 3976, 3992,
-  4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649,
-  6730, 6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135,
-  10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365,
-  11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526, 13527,
-  13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553,
-  13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658, 13673,
-  13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761, 13786,
-  13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854,
-  13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910, 13911,
-  13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926,
-  13928, 13938, 13963, 13967
+  2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3768, 3866, 3868, 3976,
+  3992, 4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578,
+  6649, 6730, 6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110,
+  10135, 10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322,
+  11365, 11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525, 13526,
+  13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552,
+  13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658,
+  13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760, 13761,
+  13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852,
+  13854, 13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908, 13910,
+  13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921,
+  13926, 13928, 13938, 13963, 13967, 13973
 
 * ISO C11 support:
 

Modified: fsf/trunk/libc/elf/tst-auditmod1.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod1.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod1.c Sat Apr 14 00:01:34 2012
@@ -109,7 +109,7 @@
 # define La_retval La_i86_retval
 # define int_retval lrv_eax
 #elif defined __x86_64__
-# ifdef __LP64__
+# ifndef __ILP32__
 #  define pltenter la_x86_64_gnu_pltenter
 #  define pltexit la_x86_64_gnu_pltexit
 #  define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod3b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod3b.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod3b.c Sat Apr 14 00:01:34 2012
@@ -105,7 +105,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+# ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod4b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod4b.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod4b.c Sat Apr 14 00:01:34 2012
@@ -94,7 +94,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+# ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod5b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod5b.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod5b.c Sat Apr 14 00:01:34 2012
@@ -95,7 +95,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+# ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod6b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod6b.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod6b.c Sat Apr 14 00:01:34 2012
@@ -94,7 +94,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+# ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod6c.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod6c.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod6c.c Sat Apr 14 00:01:34 2012
@@ -94,7 +94,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+# ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/elf/tst-auditmod7b.c
==============================================================================
--- fsf/trunk/libc/elf/tst-auditmod7b.c (original)
+++ fsf/trunk/libc/elf/tst-auditmod7b.c Sat Apr 14 00:01:34 2012
@@ -94,7 +94,7 @@
   return sym->st_value;
 }
 
-#ifdef __LP64__
+#ifndef __ILP32__
 # define pltenter la_x86_64_gnu_pltenter
 # define pltexit la_x86_64_gnu_pltexit
 # define La_regs La_x86_64_regs

Modified: fsf/trunk/libc/locale/iso-639.def
==============================================================================
--- fsf/trunk/libc/locale/iso-639.def (original)
+++ fsf/trunk/libc/locale/iso-639.def Sat Apr 14 00:01:34 2012
@@ -160,7 +160,7 @@
 DEFINE_LANGUAGE_CODE3 ("Friulian", fur, fur)
 DEFINE_LANGUAGE_CODE ("Fulah", ff, ful, ful)
 DEFINE_LANGUAGE_CODE ("Gaelic; Scottish Gaelic", gd, gla, gla)
-DEFINE_LANGUAGE_CODE ("Gallegan", gl, glg, glg)
+DEFINE_LANGUAGE_CODE ("Galician", gl, glg, glg)
 DEFINE_LANGUAGE_CODE ("Ganda", lg, lug, lug)
 DEFINE_LANGUAGE_CODE3 ("Gayo", gay, gay)
 DEFINE_LANGUAGE_CODE3 ("Ga", gaa, gaa)

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Apr 14 00:01:34 2012
@@ -1,3 +1,9 @@
+2012-04-12  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+        [BZ #3768]
+	* locales/en_GB (LC_TIME): Set am_pm and t_fmt_ampm fields.
+	* locales/cy_GB (LC_TIME): Likewise.  Also copy date_fmt from en_GB.
+
 2012-04-04  Jeff Law  <law@xxxxxxxxxx>
 
 	[BZ #6770]

Modified: fsf/trunk/libc/localedata/locales/cy_GB
==============================================================================
--- fsf/trunk/libc/localedata/locales/cy_GB (original)
+++ fsf/trunk/libc/localedata/locales/cy_GB Sat Apr 14 00:01:34 2012
@@ -248,8 +248,11 @@
 d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
 t_fmt       "<U0025><U0054>"
-am_pm       "";""
-t_fmt_ampm  ""
+am_pm       "<U0061><U006D>";"<U0070><U006D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
 END LC_TIME
 
 LC_MESSAGES

Modified: fsf/trunk/libc/localedata/locales/en_GB
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_GB (original)
+++ fsf/trunk/libc/localedata/locales/en_GB Sat Apr 14 00:01:34 2012
@@ -116,9 +116,9 @@
 d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
 t_fmt       "<U0025><U0054>"
-am_pm       "";""
-t_fmt_ampm  ""
-date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+am_pm       "<U0061><U006D>";"<U0070><U006D>"
+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
+date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 <U0025><U005A><U0020><U0025><U0059>"
 week    7;19971130;4

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c Sat Apr 14 00:01:34 2012
@@ -126,7 +126,7 @@
 
 		      __stpcpy (prop, "/clock-frequency");
 		      clkfreq_fd = open (node, O_RDONLY);
-		      if (fd != -1)
+		      if (clkfreq_fd != -1)
 			{
 			  if (read (clkfreq_fd, type_string,
 				    sizeof (type_string)) > 0)

Modified: fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h (original)
+++ fsf/trunk/libc/sysdeps/x86_64/bits/wordsize.h Sat Apr 14 00:01:34 2012
@@ -1,6 +1,6 @@
 /* Determine the wordsize from the preprocessor defines.  */
 
-#if defined __x86_64__
+#if defined __x86_64__ && !defined __ILP32__
 # define __WORDSIZE	64
 # define __WORDSIZE_COMPAT32	1
 #else

Modified: fsf/trunk/libc/sysdeps/x86_64/ffsll.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/ffsll.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/ffsll.c Sat Apr 14 00:01:34 2012
@@ -36,7 +36,7 @@
   return cnt + 1;
 }
 
-#ifdef __LP64__
+#ifndef __ILP32__
 #undef	ffsl
 weak_alias (ffsll, ffsl)
 #endif

Modified: fsf/trunk/libc/sysdeps/x86_64/preconfigure
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/preconfigure (original)
+++ fsf/trunk/libc/sysdeps/x86_64/preconfigure Sat Apr 14 00:01:34 2012
@@ -133,7 +133,7 @@
 else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __LP64__
+#ifndef __ILP32__
 # error not x32
 #endif
 int

Modified: fsf/trunk/libc/sysdeps/x86_64/preconfigure.in
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/preconfigure.in (original)
+++ fsf/trunk/libc/sysdeps/x86_64/preconfigure.in Sat Apr 14 00:01:34 2012
@@ -8,7 +8,7 @@
   AC_CACHE_CHECK(whether $CC compiles in -mx32 mode by default,
 		 libc_cv_x32, [dnl
   AC_TRY_COMPILE(dnl
-[#ifdef __LP64__
+[#ifndef __ILP32__
 # error not x32
 #endif], [], libc_cv_x32=yes, libc_cv_x32=no)])
   if test $libc_cv_x32 = yes; then

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