This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch ibm/2.18/master updated. glibc-2.18-131-g8e6ea39


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, ibm/2.18/master has been updated
       via  8e6ea3948c217401a84cd1115ca0291bdf2be90c (commit)
       via  fcb59062b1e2dcd9952dbf508c3fee7efcc329be (commit)
      from  96c5bbf7030c2b5e483485f8301f4b367e89db67 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8e6ea3948c217401a84cd1115ca0291bdf2be90c

commit 8e6ea3948c217401a84cd1115ca0291bdf2be90c
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date:   Wed Feb 5 15:29:39 2014 -0600

    Fix wrong ChangeLog merge

diff --git a/ChangeLog b/ChangeLog
index 9a0f195..01518f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -386,7 +386,12 @@
 
 2013-10-25  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
-<<<<<<< HEAD
+	[BZ #16072]
+	* sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on
+	heap for large requests.
+
+2013-10-10  Joseph Myers  <joseph@codsourcery.com>
+
 	* sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Check
 	for NaNs before doing comparisons on argument.
 	* sysdeps/ieee754/ldbl-128ibm/e_asinl.c (__ieee754_asinl):
@@ -877,11 +882,6 @@
 
 	* sysdeps/unix/sysv/linux/tst-fanotify.c: New test.
 	* sysdeps/unix/sysv/linux/Makefile (tests): Add tst-fanotify.
-=======
-	[BZ #16072]
-	* sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on
-	heap for large requests.
->>>>>>> 6f95434... Fix stack overflow due to large AF_INET6 requests
 
 2013-09-02  Joseph Myers  <joseph@codesourcery.com>
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fcb59062b1e2dcd9952dbf508c3fee7efcc329be

commit fcb59062b1e2dcd9952dbf508c3fee7efcc329be
Author: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date:   Wed Feb 5 15:28:57 2014 -0600

    Add GLIBC_2.3 to libm in Versions.def
    
    This patch adds GLIBC_2.3 mark on libm so it is always
    define in abi-versions.h. This fixes a build issue with
    fe_nomask.c in PPC64 LE where GLIBC_2_3 are no defined
    for SHLIB_COMPAT, resulting in a wrong evaluation in the macro.

diff --git a/ChangeLog b/ChangeLog
index b190338..9a0f195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-04  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
+	* Versions.def (libm): Add GLIBC_2.3.
+
+2014-02-04  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
 	* nptl/shlib-versions: Change powerpc*le start to 2.17.
 	* shlib-versions: Likewise.
 
diff --git a/Versions.def b/Versions.def
index 0854e6e..d8ef91b 100644
--- a/Versions.def
+++ b/Versions.def
@@ -55,6 +55,7 @@ libm {
   GLIBC_2.1
   GLIBC_2.2
   GLIBC_2.2.3
+  GLIBC_2.3
   GLIBC_2.3.4
   GLIBC_2.4
   GLIBC_2.15

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

Summary of changes:
 ChangeLog    |   16 ++++++++++------
 Versions.def |    1 +
 2 files changed, 11 insertions(+), 6 deletions(-)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]