[Commits] r21914 - in /branches/eglibc-2_15: ./ libc/ libc/sysdeps/powerpc/powerpc32/fpu/ libc/sysdeps/powerpc/powerpc64/fpu/ libc/sys...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sun Dec  2 21:14:57 2012
New Revision: 21914

Log:
Merge changes between r21777 and r21913 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/NEWS
    branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S
    branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
    branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/sys/sysctl.h

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  2 21:14:57 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-21777
+/fsf/glibc-2_15-branch:16509-21913
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Sun Dec  2 21:14:57 2012
@@ -1,10 +1,10 @@
-2012-11-07  Andreas Jaeger  <aj@xxxxxxx>
-
-	[BZ #14809]
-	* sysdeps/unix/sysv/linux/sys/sysctl.h (_UAPI_LINUX_KERNEL_H)
-	(_UAPI_LINUX_TYPES_H): Starting with Linux 3.7, the include header
-	guards are changed.  Only define if not yet defined, #undef back
-	after including linux/sysctl.h if defined here.
+2012-05-01  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #14040]
+	* sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S (nearbyintl): Define
+	in version GLIBC_2.1, not GLIBC_2.0.
+	* sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S (nearbyintl):
+	Likewise.
 
 2012-10-04  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 

Modified: branches/eglibc-2_15/libc/NEWS
==============================================================================
--- branches/eglibc-2_15/libc/NEWS (original)
+++ branches/eglibc-2_15/libc/NEWS Sun Dec  2 21:14:57 2012
@@ -11,7 +11,7 @@
 
   411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
   13749, 13753, 13771, 13774, 13786, 14048, 14059, 14167, 14273, 14459,
-  14621, 14648, 14809
+  14621, 14648, 14040
 
 Version 2.15
 

Modified: branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S (original)
+++ branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc32/fpu/s_nearbyint.S Sun Dec  2 21:14:57 2012
@@ -1,5 +1,5 @@
 /* Round to int floating-point values.  PowerPC32 version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Adhemerval Zanella <azanella@xxxxxxxxxx>, 2011
 
@@ -75,6 +75,6 @@
 weak_alias (__nearbyint, nearbyintl)
 strong_alias (__nearbyint, __nearbyintl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1)
 #endif

Modified: branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S (original)
+++ branches/eglibc-2_15/libc/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S Sun Dec  2 21:14:57 2012
@@ -1,5 +1,5 @@
 /* Round to int floating-point values.  PowerPC64 version.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Adhemerval Zanella <azanella@xxxxxxxxxx>, 2011
 
@@ -63,6 +63,6 @@
 weak_alias (__nearbyint, nearbyint)
 strong_alias (__nearbyint, __nearbyintl)
 #endif
-#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
-compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_0)
+#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)
+compat_symbol (libm, __nearbyint, nearbyintl, GLIBC_2_1)
 #endif

Modified: branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/sys/sysctl.h
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/sys/sysctl.h (original)
+++ branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/sys/sysctl.h Sun Dec  2 21:14:57 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1999, 2002, 2003, 2004 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
@@ -40,14 +40,6 @@
 # define __user
 # define __undef__LINUX_COMPILER_H
 #endif
-#ifndef  _UAPI_LINUX_KERNEL_H
-# define _UAPI_LINUX_KERNEL_H
-# define __undef_UAPI_LINUX_KERNEL_H
-#endif
-#ifndef _UAPI_LINUX_TYPES_H
-# define _UAPI_LINUX_TYPES_H
-# define __undef_UAPI_LINUX_TYPES_H
-#endif
 
 #include <linux/sysctl.h>
 
@@ -68,14 +60,6 @@
 # undef __user
 # undef __undef__LINUX_COMPILER_H
 #endif
-#ifdef  __undef_UAPI_LINUX_KERNEL_H
-# undef _UAPI_LINUX_KERNEL_H
-# undef __undef_UAPI_LINUX_KERNEL_H
-#endif
-#ifdef __undef_UAPI_LINUX_TYPES_H
-# undef _UAPI_LINUX_TYPES_H
-# undef __undef_UAPI_LINUX_TYPES_H
-#endif
 
 __BEGIN_DECLS
 

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