GNU C Library master sources branch master updated. glibc-2.16-ports-merge-779-ge3c6aa3

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  e3c6aa3a5848a1beff925eba9a58e4e7c7463297 (commit)
       via  4cc34c3511d1dae73381bdcd70657d92a62bee44 (commit)
      from  1bead169c32a3a688de863709b863207b7aafddd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e3c6aa3a5848a1beff925eba9a58e4e7c7463297

commit e3c6aa3a5848a1beff925eba9a58e4e7c7463297
Author: Andreas Schwab <schwab@suse.de>
Date:   Wed Nov 28 10:24:06 2012 +0100

    Properly handle indirect functions in ABI check on powerpc64

diff --git a/ChangeLog b/ChangeLog
index 2f2c9fc..14f8136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-28  Andreas Schwab  <schwab@suse.de>
+
+	* scripts/abilist.awk: Also handle indirect functions in .opd
+	section.
+
 2012-11-28  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13881]
diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index 1c1d41d..6d58f66 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -81,7 +81,7 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) {
     type = "F";
     size = "";
   }
-  else if (type == "iD" && $4 == ".text") {
+  else if (type == "iD" && ($4 == ".text" || $4 == ".opd")) {
     # Indirect functions.
     type = "F";
     size = "";

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4cc34c3511d1dae73381bdcd70657d92a62bee44

commit 4cc34c3511d1dae73381bdcd70657d92a62bee44
Author: Andreas Schwab <schwab@suse.de>
Date:   Tue Nov 27 16:43:14 2012 +0100

    Revert "2012-11-07  Andreas Jaeger  <aj@suse.de>"
    
    This reverts commit 01f34a3bd8c087ca4be0bd24857e454c8d29f20b.
    
    The issue has been fixed in the kernel.

diff --git a/ChangeLog b/ChangeLog
index d93d0a3..2f2c9fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1211,14 +1211,6 @@
 	* conform/data/stdbool.h-data: Likewise.
 	* conform/data/stdnoreturn.h-data: Likewise.
 
-2012-11-07  Andreas Jaeger  <aj@suse.de>
-
-	[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-11-07  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #14815]
diff --git a/NEWS b/NEWS
index 1d4a979..196ae30 100644
--- a/NEWS
+++ b/NEWS
@@ -20,9 +20,8 @@ Version 2.17
   14557, 14562, 14568, 14576, 14579, 14583, 14587, 14595, 14602, 14610,
   14621, 14638, 14645, 14648, 14652, 14660, 14661, 14669, 14672, 14683,
   14694, 14716, 14719, 14743, 14767, 14783, 14784, 14785, 14793, 14796,
-  14797, 14801, 14805, 14807, 14809, 14811, 14815, 14821, 14822, 14824,
-  14828, 14831, 14835, 14838, 14856, 14863, 14865, 14866, 14868, 14869,
-  14871.
+  14797, 14801, 14805, 14807, 14811, 14815, 14821, 14822, 14824, 14828,
+  14831, 14835, 14838, 14856, 14863, 14865, 14866, 14868, 14869, 14871.
 
 * Port to ARM AArch64 contributed by Linaro.
 
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
index 8b58905..cfa71ad 100644
--- a/sysdeps/unix/sysv/linux/sys/sysctl.h
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -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
@@ -39,14 +39,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>
 
@@ -67,14 +59,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
 
 #include <bits/sysctl.h>
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                            |   13 +++++--------
 NEWS                                 |    5 ++---
 scripts/abilist.awk                  |    2 +-
 sysdeps/unix/sysv/linux/sys/sysctl.h |   18 +-----------------
 4 files changed, 9 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources