[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r14015 - in /trunk: libc/ libc/iconvdata/ libc/po/ libc/sysdeps/unix/sysv/linux/bits/ libc/sysdeps/unix/sysv/linux/sparc/bit...

To: commits@xxxxxxxxxx
Subject: [commits] r14015 - in /trunk: libc/ libc/iconvdata/ libc/po/ libc/sysdeps/unix/sysv/linux/bits/ libc/sysdeps/unix/sysv/linux/sparc/bit...
From: joseph@xxxxxxxxxx
Date: Fri, 27 May 2011 16:55:57 -0000
Author: joseph
Date: Fri May 27 09:55:57 2011
New Revision: 14015

Log:
Merge changes between r13953 and r14014 from /fsf/trunk.

Added:
    trunk/libc/iconvdata/bug-iconv9.c
      - copied unchanged from r14014, fsf/trunk/libc/iconvdata/bug-iconv9.c
Modified:
    trunk/libc/ChangeLog
    trunk/libc/NEWS
    trunk/libc/iconvdata/Makefile
    trunk/libc/iconvdata/iso-2022-jp.c
    trunk/libc/po/ja.po
    trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
    trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h
    trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h
    trunk/ports/ChangeLog.mips
    trunk/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h

Modified: trunk/libc/ChangeLog
==============================================================================
--- trunk/libc/ChangeLog (original)
+++ trunk/libc/ChangeLog Fri May 27 09:55:57 2011
@@ -1,3 +1,29 @@
+2011-05-27  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12814]
+	* iconvdata/Makefile (tests): Add bug-iconv9.
+	* iconvdata/bug-iconv9.c: New file.
+
+2011-05-27  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	[BZ #12814]
+	* iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing.
+
+2011-05-25  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/x86_64/sys/user.h
+	(struct user_regs_struct): Change intcs field back to cs.
+
+2011-05-25  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* po/ja.po: Update from translation team.
+
+2011-05-23  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12795]
+	* sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_RTTIME): Define.
+	* sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise.
+
 2011-05-20  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* stdlib/longlong.h: Update from GCC.

Modified: trunk/libc/NEWS
==============================================================================
--- trunk/libc/NEWS (original)
+++ trunk/libc/NEWS Fri May 27 09:55:57 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-5-22
+GNU C Library NEWS -- history of user-visible changes.  2011-5-27
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -17,7 +17,7 @@
   12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
   12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, 12713,
   12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
-  12782, 12788, 12792
+  12782, 12788, 12792, 12795, 12814
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.

Modified: trunk/libc/iconvdata/Makefile
==============================================================================
--- trunk/libc/iconvdata/Makefile (original)
+++ trunk/libc/iconvdata/Makefile Fri May 27 09:55:57 2011
@@ -71,7 +71,7 @@
 
 ifeq (yes,$(build-shared))
 tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
-	tst-iconv6 bug-iconv5 bug-iconv8
+	tst-iconv6 bug-iconv5 bug-iconv8 bug-iconv9
 tests-$(OPTION_EGLIBC_LOCALE_CODE) += bug-iconv6 tst-iconv7
 ifeq ($(have-thread-library),yes)
 tests += bug-iconv3

Modified: trunk/libc/iconvdata/iso-2022-jp.c
==============================================================================
--- trunk/libc/iconvdata/iso-2022-jp.c (original)
+++ trunk/libc/iconvdata/iso-2022-jp.c Fri May 27 09:55:57 2011
@@ -1,5 +1,5 @@
 /* Conversion module for ISO-2022-JP and ISO-2022-JP-2.
-   Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000-2002, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
 
@@ -664,7 +664,7 @@
 									      \
 			*outptr++ = ESC;				      \
 			*outptr++ = 'N';				      \
-			*outptr++ = res;				      \
+			*outptr++ = res & 0x7f;				      \
 			written = 3;					      \
 		      }							      \
 		  }							      \
@@ -706,7 +706,7 @@
 									      \
 	    /* At the beginning of a line, G2 designation is cleared.  */     \
 	    if (var == iso2022jp2 && ch == 0x0a)			      \
-	      set2 = UNSPECIFIED_set; 					      \
+	      set2 = UNSPECIFIED_set;					      \
 	  }								      \
 	else								      \
 	  {								      \
@@ -764,9 +764,9 @@
 			++rp;						      \
 		      if (ch >= rp->start)				      \
 			{						      \
-			  unsigned char res =				      \
+			  unsigned char ch2 =				      \
 			    iso88597_from_ucs4[ch - 0xa0 + rp->idx];	      \
-			  if (res != '\0')				      \
+			  if (ch2 != '\0')				      \
 			    {						      \
 			      if (set2 != ISO88597_set)			      \
 				{					      \
@@ -789,7 +789,7 @@
 				}					      \
 			      *outptr++ = ESC;				      \
 			      *outptr++ = 'N';				      \
-			      *outptr++ = res;				      \
+			      *outptr++ = ch2 - 0x80;			      \
 			      res = __GCONV_OK;				      \
 			      break;					      \
 			    }						      \

Modified: trunk/libc/po/ja.po
==============================================================================
--- trunk/libc/po/ja.po (original)
+++ trunk/libc/po/ja.po Fri May 27 09:55:57 2011
@@ -7,9 +7,10 @@
 msgstr ""
 "Project-Id-Version: libc 2.11.1\n"
 "POT-Creation-Date: 2009-02-06 12:40-0800\n"
-"PO-Revision-Date: 2011-01-08 15:24+0900\n"
+"PO-Revision-Date: 2011-05-25 09:59+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@xxxxxxxxx>\n"
 "Language-Team: Japanese <translation-team-ja@xxxxxxxxxxxxxxxxxxxxx>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3679,9 +3680,9 @@
 msgstr "ã‚½ã‚±ãƒƒãƒˆã‚’éžãƒ–ãƒãƒƒã‚ãƒ³ã‚°ãƒ¢ãƒ¼ãƒ‰ã«å¤‰æ›´ã§ãã¾ã›ã‚“: %s"
 
 #: nscd/connections.c:930
-#, fuzzy, c-format
+#, c-format
 msgid "cannot set socket to close on exec: %s"
-msgstr "æŽ¥ç¶šã‚’å—ã‘ä»˜ã‘ã‚‹ã‚½ã‚±ãƒƒãƒˆã‚’æœ‰åŠ¹ã«ã§ãã¾ã›ã‚“: %s"
+msgstr ""
 
 #: nscd/connections.c:943
 #, c-format
@@ -4131,7 +4132,7 @@
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚ãƒ£ãƒƒã‚·ãƒ¥å†…ã« \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!"
 
 #: nscd/pwdcache.c:445
-#, fuzzy, c-format
+#, c-format
 msgid "Reloading \"%s\" in password cache!"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚ãƒ£ãƒƒã‚·ãƒ¥å†…ã® \"%s\" ã‚’å†ãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™!"
 
@@ -4596,24 +4597,23 @@
 msgstr "ãƒ¡ãƒ¢ãƒªãŒè¶³ã‚Šãªããªã‚Šã¾ã—ãŸ\n"
 
 #: sunrpc/auth_unix.c:350
-#, fuzzy
 msgid "auth_unix.c: Fatal marshalling problem"
-msgstr "auth_none.c - è‡´å‘½çš„ãªæ•´åˆ—ã®å•é¡Œ"
+msgstr ""
 
 #: sunrpc/clnt_perr.c:105 sunrpc/clnt_perr.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
-msgstr "; low ãƒãƒ¼ã‚¸ãƒ§ãƒ³ = %lu, high ãƒãƒ¼ã‚¸ãƒ§ãƒ³ = %lu"
+msgstr "%s: %s; low ãƒãƒ¼ã‚¸ãƒ§ãƒ³ = %luã€high ãƒãƒ¼ã‚¸ãƒ§ãƒ³ = %lu"
 
 #: sunrpc/clnt_perr.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s; why = %s\n"
-msgstr "; ç†ç”± = "
+msgstr "%s: %s; ç†ç”± = %s\n"
 
 #: sunrpc/clnt_perr.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
-msgstr "(ä¸æ˜Žãªèªè¨¼ã‚¨ãƒ©ãƒ¼ - %d)"
+msgstr "%s: %s; ç†ç”± = (ä¸æ˜Žãªèªè¨¼ã‚¨ãƒ©ãƒ¼ã§ã™ - %d)\n"
 
 #: sunrpc/clnt_perr.c:159
 msgid "RPC: Success"
@@ -4724,14 +4724,12 @@
 msgstr "å¤±æ•—ã—ã¾ã—ãŸ(åŽŸå› ä¸ç‰¹å®šã®ã‚¨ãƒ©ãƒ¼)"
 
 #: sunrpc/clnt_raw.c:117
-#, fuzzy
 msgid "clnt_raw.c: fatal header serialization error"
-msgstr "clnt_raw.c - ãƒ˜ãƒƒãƒ€ã®ç›´åˆ—åŒ–ã§è‡´å‘½çš„ã‚¨ãƒ©ãƒ¼."
+msgstr ""
 
 #: sunrpc/pm_getmaps.c:83
-#, fuzzy
 msgid "pmap_getmaps.c: rpc problem"
-msgstr "pmap_getmaps rpc ãŒå•é¡Œã§ã™"
+msgstr "pmap_getmaps.c: rpc å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ"
 
 #: sunrpc/pmap_clnt.c:129
 msgid "Cannot register service"
@@ -4792,9 +4790,9 @@
 msgstr "%s: C ãƒ—ãƒªãƒ—ãƒã‚»ãƒƒã‚µã¯çµ‚äº†ã‚³ãƒ¼ãƒ‰ %d ã§å¤±æ•—ã—ã¾ã—ãŸ\n"
 
 #: sunrpc/rpc_main.c:464
-#, fuzzy, c-format
+#, c-format
 msgid "illegal nettype: `%s'\n"
-msgstr "ä¸æ£ãª nettype ã§ã™:`%s'\n"
+msgstr "ä¸æ£ãª nettype ã§ã™: `%s'\n"
 
 #: sunrpc/rpc_main.c:1130
 #, c-format
@@ -4954,9 +4952,9 @@
 msgstr ""
 
 #: sunrpc/rpc_main.c:1485
-#, fuzzy, c-format
+#, c-format
 msgid "-o outfile\tname of the output file\n"
-msgstr "å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç”Ÿæˆã§ãã¾ã›ã‚“"
+msgstr "-o outfile\tå‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‚’è¨å®šã™ã‚‹\n"
 
 #: sunrpc/rpc_main.c:1486
 #, c-format
@@ -4989,9 +4987,9 @@
 msgstr ""
 
 #: sunrpc/rpc_main.c:1492
-#, fuzzy, c-format
+#, c-format
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
-msgstr "ã©ã®ã‚ˆã†ãª C ãƒ—ãƒªãƒ—ãƒã‚»ãƒƒã‚µã‚‚è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ (cpp)\n"
+msgstr "-Y path\t\tC ãƒ—ãƒªãƒ—ãƒã‚»ãƒƒã‚µ (cpp) ã‚’è¦‹ã¤ã‘ã‚‹ãŸã‚ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå\n"
 
 #: sunrpc/rpc_scan.c:114
 msgid "constant or identifier expected"
@@ -5093,9 +5091,8 @@
 msgstr "rpcinfo: %sã¯ä¸æ˜Žãªãƒ›ã‚¹ãƒˆã§ã™\n"
 
 #: sunrpc/svc_run.c:70
-#, fuzzy
 msgid "svc_run: - out of memory"
-msgstr "svctcp_create: ãƒ¡ãƒ¢ãƒªãŒè¶³ã‚Šã¾ã›ã‚“\n"
+msgstr "mesvc_run: - ãƒ¡ãƒ¢ãƒªãŒè¶³ã‚Šã¾ã›ã‚“"
 
 #: sunrpc/svc_run.c:90
 msgid "svc_run: - poll failed"
@@ -6287,19 +6284,18 @@
 msgstr ""
 
 #: timezone/zdump.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
-msgstr "%s: ä½¿ç”¨æ³• %s [ --version ] [ -v ] [ -c cutoff ] zonename ...\n"
+msgstr "%s: ä½¿ç”¨æ³•: %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
 
 #: timezone/zdump.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "%s: wild -c argument %s\n"
-msgstr "%s: å¼•æ•°ãŒå¤šã™ãŽã¾ã™\n"
+msgstr ""
 
 #: timezone/zdump.c:387
-#, fuzzy
 msgid "Error writing to standard output"
-msgstr "ã‚¨ãƒ©ãƒ¼ã‚’æ¨™æº–å‡ºåŠ›ã«æ›¸ãå‡ºã—ä¸"
+msgstr ""
 
 #: timezone/zdump.c:410
 #, c-format
@@ -6326,13 +6322,13 @@
 msgstr "è¦å‘Š: "
 
 #: timezone/zic.c:459
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
-"%s: ä½¿ç”¨æ³• %s [ --version ] [ -s ] [ -v ] [ -l ãƒãƒ¼ã‚«ãƒ«æ™‚åˆ» ] [ -p posixrules ] \\\n"
-"\t[ -d ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª ] [ -L é–ç§’ ] [ -y yearistype ] [ ãƒ•ã‚¡ã‚¤ãƒ«å ... ]\n"
+"%s: ä½¿ç”¨æ³•: %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 
 #: timezone/zic.c:494
 msgid "wild compilation-time specification of zic_t"
@@ -6364,9 +6360,8 @@
 msgstr "%s: -L ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒè¤‡æ•°æŒ‡å®šã•ã‚Œã¦ã„ã¾ã™\n"
 
 #: timezone/zic.c:600
-#, fuzzy
 msgid "link to link"
-msgstr "è¡ŒãŒé•·ã™ãŽã¾ã™"
+msgstr ""
 
 #: timezone/zic.c:665
 msgid "hard link failed, symbolic link used"
@@ -6606,9 +6601,8 @@
 msgstr "ãƒãƒ¼ã‚«ãƒ«æ™‚é–“å½¢å¼ãŒå¤šã™ãŽã¾ã™"
 
 #: timezone/zic.c:2268
-#, fuzzy
 msgid "UTC offset out of range"
-msgstr "ãƒãƒ£ãƒ³ãƒãƒ«ç•ªå·ãŒç¯„å›²å¤–ã§ã™"
+msgstr "UTC ã‚ªãƒ•ã‚»ãƒƒãƒˆãŒç¯„å›²å¤–ã§ã™"
 
 #: timezone/zic.c:2296
 msgid "too many leap seconds"
@@ -6811,7 +6805,7 @@
 #~ msgstr "\"%s\" ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›¸ãè¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ"
 
 #~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "Java ã‚³ãƒ³ãƒ‘ã‚¤ãƒ©ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚ gcj ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‹ã€ã¾ãŸã¯t $JAVAC ã‚’è¨å®šã—ã¦ã¿ã¦ãã ã•ã„"
+#~ msgstr "Java ã‚³ãƒ³ãƒ‘ã‚¤ãƒ©ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚ gcj ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‹ã€ã¾ãŸã¯ $JAVAC ã‚’è¨å®šã—ã¦ã¿ã¦ãã ã•ã„"
 
 #~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
 #~ msgstr "Java ä»®æƒ³ãƒžã‚·ãƒ³ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã€‚ gij ã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‹ã€ã¾ãŸã¯ $JAVA ã‚’è¨å®šã—ã¦ã¿ã¦ãã ã•ã„"
@@ -7054,13 +7048,8 @@
 #~ msgid "%s%s argument `%s' too large"
 #~ msgstr "å¼•æ•° `%3$s' ã«å¯¾ã™ã‚‹ %1$s%2$s ãŒå¤§ãã™ãŽã¾ã™"
 
-#, fuzzy
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr ""
-#~ "#-#-#-#-#  gnulib-2.0.0.3462.e9796.ja.po (gnulib 2.0.0.3462.e9796)  #-#-#-#-#\n"
-#~ "%s: ä¸æ£ãªã‚ªãƒ—ã‚·ãƒ§ãƒ³ -- %c\n"
-#~ "#-#-#-#-#  libc-2.11.1.ja.po.orig (libc 2.11.1)  #-#-#-#-#\n"
-#~ "%s: ä¸æ£ãªã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ -- %c\n"
+#~ msgstr "%s: ä¸æ£ãªã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ -- %c\n"
 
 #~ msgid "block size"
 #~ msgstr "ãƒ–ãƒãƒƒã‚¯ã‚µã‚¤ã‚º"

Modified: trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/bits/resource.h Fri May 27 09:55:57 2011
@@ -1,5 +1,5 @@
 /* Bit values & structures for resource limits.  Linux version.
-   Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010
+   Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -100,7 +100,13 @@
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
 
-  __RLIMIT_NLIMITS = 15,
+  /* Maximum CPU time in Âµs that a process scheduled under a real-time
+     scheduling policy may consume without making a blocking system
+     call before being forcibly descheduled.  */
+  __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+  __RLIMIT_NLIMITS = 16,
   __RLIM_NLIMITS = __RLIMIT_NLIMITS
 #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
 #define RLIM_NLIMITS __RLIM_NLIMITS

Modified: trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h Fri May 27 09:55:57 2011
@@ -1,5 +1,5 @@
 /* Bit values & structures for resource limits.  Linux/SPARC version.
-   Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2008, 2009
+   Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -100,7 +100,13 @@
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
 
-  __RLIMIT_NLIMITS = 15,
+  /* Maximum CPU time in Âµs that a process scheduled under a real-time
+     scheduling policy may consume without making a blocking system
+     call before being forcibly descheduled.  */
+  __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+  __RLIMIT_NLIMITS = 16,
   __RLIM_NLIMITS = __RLIMIT_NLIMITS
 #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
 #define RLIM_NLIMITS __RLIM_NLIMITS

Modified: trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h
==============================================================================
--- trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h (original)
+++ trunk/libc/sysdeps/unix/sysv/linux/x86_64/sys/user.h Fri May 27 09:55:57 2011
@@ -61,7 +61,7 @@
   unsigned long int rdi;
   unsigned long int orig_rax;
   unsigned long int rip;
-  unsigned long int intcs;
+  unsigned long int cs;
   unsigned long int eflags;
   unsigned long int rsp;
   unsigned long int ss;

Modified: trunk/ports/ChangeLog.mips
==============================================================================
--- trunk/ports/ChangeLog.mips (original)
+++ trunk/ports/ChangeLog.mips Fri May 27 09:55:57 2011
@@ -1,3 +1,8 @@
+2011-05-23  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/resource.h (RLIMIT_RTTIME):
+	Add.
+
 2011-05-13  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/dl-lookup.c: Update from generic version.

Modified: trunk/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h
==============================================================================
--- trunk/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h (original)
+++ trunk/ports/sysdeps/unix/sysv/linux/mips/bits/resource.h Fri May 27 09:55:57 2011
@@ -1,6 +1,6 @@
 /* Bit values & structures for resource limits.  Linux/MIPS version.
    Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2004, 2005, 2006, 2008,
-   2009, 2010 Free Software Foundation, Inc.
+   2009, 2010, 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
@@ -100,7 +100,13 @@
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
 
-  __RLIMIT_NLIMITS = 15,
+  /* Maximum CPU time in Âµs that a process scheduled under a real-time
+     scheduling policy may consume without making a blocking system
+     call before being forcibly descheduled.  */
+  __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+  __RLIMIT_NLIMITS = 16,
   __RLIM_NLIMITS = __RLIMIT_NLIMITS
 #define RLIMIT_NLIMITS __RLIMIT_NLIMITS
 #define RLIM_NLIMITS __RLIM_NLIMITS
Prev by Date: [commits] r14011 - in /fsf/glibc-2_11-branch/libc: ./ conform/data/ elf/ iconv/ include/ inet/ libio/ login/programs/ math/ misc/ nptl...
Next by Date: [commits] r14016 - in /branches/eglibc-2_11/libc: ./ conform/data/ elf/ iconv/ include/ inet/ libio/ login/programs/ math/ misc/ nptl/...
Previous by thread: [commits] r14011 - in /fsf/glibc-2_11-branch/libc: ./ conform/data/ elf/ iconv/ include/ inet/ libio/ login/programs/ math/ misc/ nptl...
Next by thread: [commits] r14016 - in /branches/eglibc-2_11/libc: ./ conform/data/ elf/ iconv/ include/ inet/ libio/ login/programs/ math/ misc/ nptl/...
Index(es):
- Date
- Thread