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

[Commits] r21484 - in /fsf/trunk/libc: ./ conform/ conform/data/ conform/data/sys/ iconvdata/ include/ include/sys/ localedata/ locale...



Author: eglibc
Date: Sat Nov  3 00:02:43 2012
New Revision: 21484

Log:
Import glibc-mainline for 2012-11-03

Added:
    fsf/trunk/libc/conform/data/fenv.h-data
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/aclocal.m4
    fsf/trunk/libc/configure.in
    fsf/trunk/libc/conform/conformtest.pl
    fsf/trunk/libc/conform/data/complex.h-data
    fsf/trunk/libc/conform/data/inttypes.h-data
    fsf/trunk/libc/conform/data/sys/wait.h-data
    fsf/trunk/libc/iconvdata/bug-iconv8.c
    fsf/trunk/libc/iconvdata/bug-iconv9.c
    fsf/trunk/libc/include/fenv.h
    fsf/trunk/libc/include/sys/syslog.h
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/fi_FI@euro
    fsf/trunk/libc/math/math.h
    fsf/trunk/libc/sysdeps/powerpc/sys/platform/ppc.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Nov  3 00:02:43 2012
@@ -1,3 +1,56 @@
+2012-11-02  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* conform/conformtest.pl (@headers): Add fenv.h.
+	* conform/data/fenv.h-data: New file.
+	* include/fenv.h [_ISOMAC]: Disable all contents of file except
+	include of <math/fenv.h>.
+
+	* conform/data/complex.h-data [ISO99 || ISO11 || XOPEN2K ||
+	POSIX2008]: Change condition to [!ISO && !POSIX && !XPG3 && !XPG4
+	&& !UNIX98].  Enables tests for XOPEN2K8.
+	* conform/data/inttypes.h-data [ISO99 || ISO11 || XOPEN2K ||
+	POSIX2008]: Likewise.
+
+	* conform/data/sys/wait.h-data [XPG3 || XOPEN2K8 || POSIX2008]
+	(struct rusage): Do not expect type or its members.
+
+	[BZ #3439]
+	* math/math.h (FP_NAN): Define macro to integer constant usable in
+	#if and use that to give value to enum constant.
+	(FP_INFINITE): Likewise.
+	(FP_ZERO): Likewise.
+	(FP_SUBNORMAL): Likewise.
+	(FP_NORMAL): Likewise.
+
+2012-11-02  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* iconvdata/bug-iconv8.c (do_test): Use %z for size_t arguments.
+	* iconvdata/bug-iconv9.c (do_test): Use %t for ptrdiff_t
+	arguments.
+
+2012-11-02  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* aclocal.m4 (GLIBC_AUTOCONF_VERSION): New macro.
+	Check that AC_AUTOCONF_VERSION matches it and m4_fatal at
+	autoconf-time if not.
+	* configure.in: Remove AC_PREREQ.
+
+2012-11-02  Tulio Magno Quites Machado Filho  <tuliom@xxxxxxxxxxxxxxxxxx>
+
+	* sysdeps/powerpc/sys/platform/ppc.h (__ppc_get_timebase): Use
+	__builtin_ppc_get_timebase when building with GCC >= 4.8 instead
+	of the internal implementation.
+
+2012-11-02  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* include/sys/syslog.h [_ISOMAC]: Disable all contents of file
+	except include of <misc/sys/syslog.h>.
+
+2012-11-01  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: If the
+	function returns with a NULL context exit with zero.
+
 2012-11-01  Tulio Magno Quites Machado Filho  <tuliom@xxxxxxxxxxxxxxxxxx>
 
 	* sysdeps/powerpc/Makefile (cflags): Remove -mnew-mnemonics.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Nov  3 00:02:43 2012
@@ -17,7 +17,7 @@
   14459, 14476, 14477, 14505, 14510, 14516, 14518, 14519, 14530, 14532,
   14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583,
   14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660,
-  14661, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785.
+  14661, 14669, 14683, 14694, 14716, 14743, 14767, 14783, 14784, 14785.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

Modified: fsf/trunk/libc/aclocal.m4
==============================================================================
--- fsf/trunk/libc/aclocal.m4 (original)
+++ fsf/trunk/libc/aclocal.m4 Sat Nov  3 00:02:43 2012
@@ -1,3 +1,13 @@
+dnl We require that everyone use exactly the same Autoconf version so that
+dnl the internal functions defined and used by the main configure script
+dnl match those expected by the fragments.
+m4_define([GLIBC_AUTOCONF_VERSION], [2.68])
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
+      [m4_fatal(m4_flatten(
+Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
+m4_defn([AC_AUTOCONF_VERSION])
+), [63])])dnl
+dnl
 dnl We define the macro GLIBC_PROVIDES to do an AC_PROVIDE for each macro
 dnl which appears in configure.in before the sysdep configure scripts are run.
 dnl Each sysdep configure.in does GLIBC_PROVIDES first, to avoid any

Modified: fsf/trunk/libc/configure.in
==============================================================================
--- fsf/trunk/libc/configure.in (original)
+++ fsf/trunk/libc/configure.in Sat Nov  3 00:02:43 2012
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.53)dnl		dnl Minimum Autoconf version required.
+dnl Note we do not use AC_PREREQ here!  See aclocal.m4 for what we use instead.
 AC_INIT([GNU C Library], [(see version.h)], [http://sourceware.org/bugzilla/], [glibc])
 AC_CONFIG_SRCDIR([include/features.h])
 AC_CONFIG_HEADERS([config.h])

Modified: fsf/trunk/libc/conform/conformtest.pl
==============================================================================
--- fsf/trunk/libc/conform/conformtest.pl (original)
+++ fsf/trunk/libc/conform/conformtest.pl Sat Nov  3 00:02:43 2012
@@ -27,7 +27,7 @@
 	      "netdb.h", "ndbm.h", "mqueue.h", "monetary.h", "math.h",
 	      "locale.h", "libgen.h", "limits.h", "langinfo.h", "iso646.h",
 	      "inttypes.h", "iconv.h", "grp.h", "glob.h", "ftw.h", "fnmatch.h",
-	      "fmtmsg.h", "float.h", "fcntl.h", "errno.h", "dlfcn.h",
+	      "fmtmsg.h", "float.h", "fenv.h", "fcntl.h", "errno.h", "dlfcn.h",
 	      "dirent.h", "ctype.h", "cpio.h", "complex.h", "assert.h",
 	      "arpa/inet.h", "aio.h");
 }

Modified: fsf/trunk/libc/conform/data/complex.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/complex.h-data (original)
+++ fsf/trunk/libc/conform/data/complex.h-data Sat Nov  3 00:02:43 2012
@@ -1,4 +1,4 @@
-#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 macro complex
 macro _Complex_I
 optional-macro imaginary

Added: fsf/trunk/libc/conform/data/fenv.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/fenv.h-data (added)
+++ fsf/trunk/libc/conform/data/fenv.h-data Sat Nov  3 00:02:43 2012
@@ -1,0 +1,36 @@
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+type fenv_t
+type fexcept_t
+
+optional-macro-int-constant FE_DIVBYZERO
+optional-macro-int-constant FE_INEXACT
+optional-macro-int-constant FE_INVALID
+optional-macro-int-constant FE_OVERFLOW
+optional-macro-int-constant FE_UNDERFLOW
+macro-int-constant FE_ALL_EXCEPT
+
+optional-macro-int-constant FE_DOWNWARD
+optional-macro-int-constant FE_TONEAREST
+optional-macro-int-constant FE_TOWARDZERO
+optional-macro-int-constant FE_UPWARD
+
+allow FE_[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*
+
+macro FE_DFL_ENV {const fenv_t *}
+
+function int feclearexcept (int)
+function int fegetexceptflag (fexcept_t*, int)
+function int feraiseexcept (int)
+function int fesetexceptflag (const fexcept_t*, int)
+function int fetestexcept (int)
+function int fegetround (void)
+function int fesetround (int)
+function int fegetenv (fenv_t*)
+function int feholdexcept (fenv_t*)
+function int fesetenv (const fenv_t*)
+function int feupdateenv (const fenv_t *)
+
+#if !defined ISO && !defined ISO99 && !defined ISO11
+allow *_t
+#endif
+#endif

Modified: fsf/trunk/libc/conform/data/inttypes.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/inttypes.h-data (original)
+++ fsf/trunk/libc/conform/data/inttypes.h-data Sat Nov  3 00:02:43 2012
@@ -1,4 +1,4 @@
-#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined POSIX2008
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 type int8_t
 type int16_t
 type int32_t

Modified: fsf/trunk/libc/conform/data/sys/wait.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/sys/wait.h-data (original)
+++ fsf/trunk/libc/conform/data/sys/wait.h-data Sat Nov  3 00:02:43 2012
@@ -47,7 +47,7 @@
 element siginfo_t long si_band
 element siginfo_t {union sigval} si_value
 
-#if !defined POSIX
+#if !defined POSIX && !defined XPG3 && !defined XOPEN2K8 && !defined POSIX2008
 type {struct rusage}
 
 element {struct rusage} {struct timeval} ru_utime

Modified: fsf/trunk/libc/iconvdata/bug-iconv8.c
==============================================================================
--- fsf/trunk/libc/iconvdata/bug-iconv8.c (original)
+++ fsf/trunk/libc/iconvdata/bug-iconv8.c Sat Nov  3 00:02:43 2012
@@ -24,7 +24,7 @@
    ret = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
    iconv_close(cd);
 
-   printf("result: %ld %d %ld %d\n", ret, errno, inbytesleft, inbuf[0]);
+   printf("result: %zd %d %zd %d\n", ret, errno, inbytesleft, inbuf[0]);
 
    /*
     * result: -1 84 0 0        (84=EILSEQ)

Modified: fsf/trunk/libc/iconvdata/bug-iconv9.c
==============================================================================
--- fsf/trunk/libc/iconvdata/bug-iconv9.c (original)
+++ fsf/trunk/libc/iconvdata/bug-iconv9.c Sat Nov  3 00:02:43 2012
@@ -37,7 +37,7 @@
     }
   if (in != inbuf + sizeof (inbuf) - 1)
     {
-      printf ("in advanced by %jd, expected %zu\n",
+      printf ("in advanced by %td, expected %zu\n",
 	      in - inbuf, sizeof (inbuf) - 1);
       res = 1;
     }

Modified: fsf/trunk/libc/include/fenv.h
==============================================================================
--- fsf/trunk/libc/include/fenv.h (original)
+++ fsf/trunk/libc/include/fenv.h Sat Nov  3 00:02:43 2012
@@ -1,6 +1,7 @@
 #ifndef _FENV_H
 #include <math/fenv.h>
 
+#ifndef _ISOMAC
 /* Now define the internal interfaces.  */
 
 extern int __feclearexcept (int __excepts);
@@ -19,5 +20,6 @@
 libm_hidden_proto (feholdexcept)
 libm_hidden_proto (feupdateenv)
 libm_hidden_proto (fetestexcept)
+#endif
 
 #endif

Modified: fsf/trunk/libc/include/sys/syslog.h
==============================================================================
--- fsf/trunk/libc/include/sys/syslog.h (original)
+++ fsf/trunk/libc/include/sys/syslog.h Sat Nov  3 00:02:43 2012
@@ -1,5 +1,6 @@
 #include <misc/sys/syslog.h>
 
+#ifndef _ISOMAC
 libc_hidden_proto (syslog)
 libc_hidden_proto (vsyslog)
 
@@ -7,3 +8,4 @@
 			   __gnuc_va_list __ap)
      __attribute__ ((__format__ (__printf__, 3, 0)));
 libc_hidden_proto (__vsyslog_chk)
+#endif

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Nov  3 00:02:43 2012
@@ -1,3 +1,9 @@
+2012-11-02  Marko Myllynen  <myllynen@xxxxxxxxxx>
+
+	[BZ #14669]
+	* locales/fi_FI@euro (LC_IDENTIFICATION): Add missing
+	LC_MEASUREMENT, fix LC_TELEPHONE category.
+
 2012-10-31  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* Makefile [$(run-built-tests) = yes] (LOCALES): Add en_US.UTF-8.

Modified: fsf/trunk/libc/localedata/locales/fi_FI@euro
==============================================================================
--- fsf/trunk/libc/localedata/locales/fi_FI@euro (original)
+++ fsf/trunk/libc/localedata/locales/fi_FI@euro Sat Nov  3 00:02:43 2012
@@ -1,4 +1,4 @@
-escape_char	/
+escape_char     /
 comment_char    %
 
 % Finnish language locale for Finland with Euro
@@ -33,10 +33,10 @@
 category  "fi_FI@euro:2000";LC_MONETARY
 category  "fi_FI@euro:2000";LC_MESSAGES
 category  "fi_FI@euro:2000";LC_PAPER
+category  "fi_FI@euro:2000";LC_MEASUREMENT
 category  "fi_FI@euro:2000";LC_NAME
 category  "fi_FI@euro:2000";LC_ADDRESS
-category  "fi_FI:2000";LC_TELEPHONE
-
+category  "fi_FI@euro:2000";LC_TELEPHONE
 END LC_IDENTIFICATION
 
 LC_COLLATE

Modified: fsf/trunk/libc/math/math.h
==============================================================================
--- fsf/trunk/libc/math/math.h (original)
+++ fsf/trunk/libc/math/math.h Sat Nov  3 00:02:43 2012
@@ -189,16 +189,21 @@
 /* All floating-point numbers can be put in one of these categories.  */
 enum
   {
-    FP_NAN,
-# define FP_NAN FP_NAN
-    FP_INFINITE,
-# define FP_INFINITE FP_INFINITE
-    FP_ZERO,
-# define FP_ZERO FP_ZERO
-    FP_SUBNORMAL,
-# define FP_SUBNORMAL FP_SUBNORMAL
-    FP_NORMAL
-# define FP_NORMAL FP_NORMAL
+    FP_NAN =
+# define FP_NAN 0
+      FP_NAN,
+    FP_INFINITE =
+# define FP_INFINITE 1
+      FP_INFINITE,
+    FP_ZERO =
+# define FP_ZERO 2
+      FP_ZERO,
+    FP_SUBNORMAL =
+# define FP_SUBNORMAL 3
+      FP_SUBNORMAL,
+    FP_NORMAL =
+# define FP_NORMAL 4
+      FP_NORMAL
   };
 
 /* Return number of classification appropriate for X.  */

Modified: fsf/trunk/libc/sysdeps/powerpc/sys/platform/ppc.h
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/sys/platform/ppc.h (original)
+++ fsf/trunk/libc/sysdeps/powerpc/sys/platform/ppc.h Sat Nov  3 00:02:43 2012
@@ -19,6 +19,7 @@
 #ifndef _SYS_PLATFORM_PPC_H
 #define _SYS_PLATFORM_PPC_H	1
 
+#include <features.h>
 #include <stdint.h>
 #include <bits/ppc.h>
 
@@ -26,13 +27,16 @@
 static inline uint64_t
 __ppc_get_timebase (void)
 {
-#ifdef __powerpc64__
+#if __GNUC_PREREQ (4, 8)
+  return __builtin_ppc_get_timebase ();
+#else
+# ifdef __powerpc64__
   uint64_t __tb;
   /* "volatile" is necessary here, because the user expects this assembly
      isn't moved after an optimization.  */
   __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
   return __tb;
-#else  /* not __powerpc64__ */
+# else  /* not __powerpc64__ */
   uint32_t __tbu, __tbl, __tmp; \
   __asm__ volatile ("0:\n\t"
 		    "mftbu %0\n\t"
@@ -42,7 +46,8 @@
 		    "bne- 0b"
 		    : "=r" (__tbu), "=r" (__tbl), "=r" (__tmp));
   return (((uint64_t) __tbu << 32) | __tbl);
-#endif  /* not __powerpc64__ */
+# endif  /* not __powerpc64__ */
+#endif
 }
 
 #endif  /* sys/platform/ppc.h */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S Sat Nov  3 00:02:43 2012
@@ -134,26 +134,26 @@
 	   'makecontext' call.  If the pointer is NULL the process must
 	   terminate.  */
 L(exitcode):
-   /* Recover the ucontext and TOC from the dummy frame.  */
-  ld    r1,FRAME_BACKCHAIN(r1)  /* Unstack the parameter save area frame.  */
-  ld    r3,FRAME_PARM1_SAVE(r1)
-  ld    r2,FRAME_TOC_SAVE(r1)
-  ld    r3,UCONTEXT_LINK(r3)  /* Load the resume context.  */
-  cmpdi r3,0
-  beq   L(BADSTATUS)
+	/* Recover the ucontext and TOC from the dummy frame.  */
+	ld    r1,FRAME_BACKCHAIN(r1)  /* Unstack the parameter save area frame.  */
+	ld    r3,FRAME_PARM1_SAVE(r1)
+	ld    r2,FRAME_TOC_SAVE(r1)
+	ld    r3,UCONTEXT_LINK(r3)  /* Load the resume context.  */
+	cmpdi r3,0
+	beq   L(do_exit)
 	bl    JUMPTARGET(__setcontext)
 	nop
-
-L(BADSTATUS):
-/* If setcontext returns (which can happen if the syscall fails) we will
-   exit the program with error status (-1).  */
-  li    r3,-1
+	/* If setcontext returns (which can happen if the syscall fails) we will
+	   exit the program with error status (-1).  */
+	li    r3,-1
+L(do_exit):
 #ifdef SHARED
-  b     JUMPTARGET(__GI_exit);
+	b     JUMPTARGET(__GI_exit);
 #else
-  b     JUMPTARGET(exit);
-  nop
+	b     JUMPTARGET(exit);
+	nop
 #endif
+	b    L(do_exit)
 
   /* The address of the exit code is in the link register.  Store the lr
      in the ucontext as LNK so the target function will return to our

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